Skip to content
GitLab
Commit 3108a8bc authored by Erin van der Veen's avatar Erin van der Veen
Browse files

Introduce architecture dependent Platform files 

This allows building for arm and intel without having to apply a patch
parent 0f14e621
Pipeline #42853 passed with stage
in 1 minute and 1 second
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 3108a8bc
......@@ -5,8 +5,8 @@ test:
- apt-get install -y -qq build-essential
image: "camilstaps/clean:nightly"
script:
- clm -nt -nr -h 67108864 -s 5242880 -IL ArgEnv -IL StdLib -IL Directory -I Pm -I Unix -I Util -I BatchBuild -I Interfaces/LinkerInterface -I cpm/Posix -I cpm Cpm -o cpm/cpm
- cpm CpmLinux.prj --force
- clm -nt -nr -h 67108864 -s 5242880 -IL ArgEnv -IL StdLib -IL Directory -I Pm -I Unix -I Unix/Intel -I Util -I BatchBuild -I Interfaces/LinkerInterface -I cpm/Posix -I cpm Cpm -o cpm/cpm
- cpm CpmLinuxIntel.prj --force
artifacts:
paths:
- "cpm/cpm"
BatchBuild/make.linux.sh
View file @ 3108a8bc
clm -IL ArgEnv -IL StdLib -IL StdEnv -IL Directory -I ../Pm -I ../Util -I ../Unix -I ../Interfaces/LinkerInterface BatchBuild -o batch_build
clm -IL ArgEnv -IL StdLib -IL StdEnv -IL Directory -I ../Pm -I ../Util -I ../Unix -I ../Unix/Intel -I ../Interfaces/LinkerInterface BatchBuild -o batch_build
CpmLinux.prj → CpmLinuxArm.prj
View file @ 3108a8bc
......@@ -49,6 +49,7 @@ Global
Path: {Project}*cpm*Posix
Path: {Project}*Pm
Path: {Project}*Unix
Path: {Project}*Unix*Arm
Path: {Project}*Util
Path: {Project}*BatchBuild
Path: {Project}*Interfaces*LinkerInterface
......
CpmLinuxIntel.prj 0 → 100644
View file @ 3108a8bc
Version: 1.5
Global
ProjectRoot: .
Target: StdEnv
Exec: {Project}/cpm/cpm
ByteCode:
CodeGen
CheckStacks: False
CheckIndexes: True
OptimiseABC: False
GenerateByteCode: False
Application
HeapSize: 67108864
StackSize: 5242880
ExtraMemory: 8192
IntialHeapSize: 204800
HeapSizeMultiplier: 4096
ShowExecutionTime: False
ShowGC: False
ShowStackSize: False
MarkingCollector: False
DisableRTSFlags: False
StandardRuntimeEnv: True
Profile
Memory: False
MemoryMinimumHeapSize: 0
Time: False
Stack: False
Dynamics: False
GenericFusion: False
DescExL: False
Output
Output: NoReturnType
Font: Monaco
FontSize: 9
WriteStdErr: False
Link
LinkMethod: Static
GenerateRelocations: False
GenerateSymbolTable: False
GenerateLinkMap: False
LinkResources: False
ResourceSource:
GenerateDLL: False
ExportedNames:
StripByteCode: False
Paths
Path: {Project}*cpm
Path: {Project}*cpm*Posix
Path: {Project}*Pm
Path: {Project}*Unix
Path: {Project}*Unix*Intel
Path: {Project}*Util
Path: {Project}*BatchBuild
Path: {Project}*Interfaces*LinkerInterface
Path: {Application}*lib*ArgEnv
Path: {Application}*lib*StdLib
Path: {Application}*lib*Directory
Precompile:
Postlink:
MainModule
Name: Cpm
Dir: {Project}*cpm
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
StrictnessAnalysis: True
ListTypes: StrictExportTypes
ListAttributes: True
Warnings: True
Verbose: True
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
Unix/Platform.dcl → Unix/Arm/Platform.dcl
View file @ 3108a8bc
......@@ -5,6 +5,8 @@ PlatformDependant win_linux_macosx mac :== win_linux_macosx
IF_MACOSX macosx not_macosx :== not_macosx
IF_WINDOWS windows not_windows :== not_windows
IF_ARM arm other :== arm
DirSeparator:=='/'
DirSeparatorString:=="/"
......
Unix/Intel/Platform.dcl 0 → 100644
View file @ 3108a8bc
definition module Platform
PlatformDependant win_linux_macosx mac :== win_linux_macosx
IF_MACOSX macosx not_macosx :== not_macosx
IF_WINDOWS windows not_windows :== not_windows
IF_ARM arm other :== other
DirSeparator:=='/'
DirSeparatorString:=="/"
EnvsDirName:==""
TempDir :== "/tmp"
application_path :: !{#Char} -> {#Char}
Unix/Intel/Platform.icl 0 → 100644
View file @ 3108a8bc
implementation module Platform;
import StdEnv;
application_path :: !{#Char} -> {#Char};
application_path file_name
# s_p = get_appl_path_address;
# end_p = c_string_end s_p;
# s = {c_string_char p \\ p<-[s_p..end_p-1]}
= s+++("/"+++file_name);
c_string_end :: !Int -> Int;
c_string_end p
| c_string_char p<>'\0'
= c_string_end (p+1);
= p;
c_string_char :: !Int -> Char;
c_string_char p = code inline {
load_ui8 0
}
get_appl_path_address :: Int;
get_appl_path_address = code {
pushLc appl_path
}
Unix/PmCleanSystem.icl
View file @ 3108a8bc
......@@ -3,7 +3,7 @@ implementation module PmCleanSystem
import StdEnv,StdMisc,StdMaybe
from Directory import pd_StringToPath,getFileInfo,createDirectory,::Path,::FileInfo{pi_fileInfo},::PI_FileInfo{isDirectory},::DirError(..)
import UtilStrictLists
from Platform import DirSeparatorString,IF_MACOSX
from Platform import DirSeparatorString,IF_MACOSX,IF_ARM
import StdPathname
import PmTypes
from PmCompilerOptions import ::CompilerOptions(..),::ListTypes(..),instance == ListTypes
......@@ -986,7 +986,7 @@ write_options_file options_file_name flags heap_size stack_size initial_heap_siz
#! file = IF_INT_64_OR_32
(file FWI
0x464c457f FWI 0x00010102 FWI 0x00000000 FWI 0x00000000 FWI
0x003e0001 FWI 0x00000001 FWI 0x00000000 FWI 0x00000000 FWI
(IF_ARM 0x00b70001 0x003e0001) FWI 0x00000001 FWI 0x00000000 FWI 0x00000000 FWI
0x00000000 FWI 0x00000000 FWI 0x00000094 FWI 0x00000000 FWI
0x00000000 FWI 0x00000040 FWI 0x00400000 FWI 0x00040007 FWI
......
Unix/set_return_code.icl
View file @ 3108a8bc
implementation module set_return_code
import Platform
import StdInt
set_return_code_world :: !Int !*World -> *World
set_return_code_world i world = IF_INT_64_OR_32 (set_return_code_world64 i world) (set_return_code_world32 i world)
set_return_code_world i world = IF_ARM (set_return_code_world_arm i world) (set_return_code_world_intel i world)
set_return_code_world64 :: !Int !*World -> *World
set_return_code_world64 i world = code {
set_return_code_world_intel :: !Int !*World -> *World
set_return_code_world_intel i world = IF_INT_64_OR_32 (set_return_code_world_intel_64 i world) (set_return_code_world_intel_32 i world)
set_return_code_world_arm :: !Int !*World -> *World
set_return_code_world_arm i world = IF_INT_64_OR_32 (set_return_code_world_arm_64 i world) (set_return_code_world_arm_32 i world)
set_return_code_world_intel_64 :: !Int !*World -> *World
set_return_code_world_intel_64 i world = code {
pushI 0
pushLc return_code
:xxx
......@@ -20,8 +28,8 @@ set_return_code_world64 i world = code {
pop_a 1
}
set_return_code_world32 :: !Int !*World -> *World
set_return_code_world32 i world = code {
set_return_code_world_intel_32 :: !Int !*World -> *World
set_return_code_world_intel_32 i world = code {
fill_a 0 1
pop_a 1
pushI 0
......@@ -37,3 +45,50 @@ set_return_code_world32 i world = code {
instruction 20
instruction 24
}
set_return_code_world_arm_64 :: !Int !*World -> *World
set_return_code_world_arm_64 i world = code {
pushI 0xffffffff
and%
pushLc return_code
:xxx
| assume 4 byte aligned, little endian
| i<<32 if 8 byte misaligned
pushI 3
push_b 1
pushI 4
and%
shiftl%
push_b 2
shiftl%
update_b 0 2
pop_b 1
| pointer and not 4
pushI -5
and%
| or 8 bytes
pushI -8
addI
push_b_a 0
pop_b 1
pushI_a 0
or%
fill1_r _ 0 1 0 0
.keep 0 2
fill_a 1 2
pop_a 2
}
set_return_code_world_arm_32 :: !Int !*World -> *World
set_return_code_world_arm_32 i world = code {
pushI -4
pushLc return_code
addI
:xxx
push_b_a 0
pop_b 1
fill1_r _ 0 1 0 0
.keep 0 2
fill_a 1 2
pop_a 2
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment