Home Explore Help
Register Sign In
oberon
/
A2OS
mirror of https://github.com/yarrom/A2OS.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Be explicit about bit size of AMD-backend

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8064 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 years ago
parent
adb049b3f6
commit
c4786e3dee
4 changed files with 8 additions and 8 deletions
Split View Show Diff Stats
  1. 1 1
      source/Build.Tool
  2. 5 5
      source/Compiler.Mod
  3. 1 1
      source/EFI.Tool
  4. 1 1
      source/Windows.StdIO.Mod

+ 1 - 1
source/Build.Tool
View File 

@@ -275,7 +275,7 @@ Release.Build --path="../Test/" --build --zip --xml Bios32 ~
 
 
 System.DoCommands
 
 
-Compiler.Compile  -b=AMD --objectFileExtension=.Obx --symbolFileExtension=.Obx --destPath=../Test/ BIOS.PCI.Mod UsbEhci.Mod UsbEhciPCI.Mod  ~
 
+Compiler.Compile  -b=AMD --bits=32 --objectFileExtension=.Obx --symbolFileExtension=.Obx --destPath=../Test/ BIOS.PCI.Mod UsbEhci.Mod UsbEhciPCI.Mod  ~
 
 
 PCAAMD64.Assemble OBLUnreal.Asm ~
 
 PartitionsLib.SetBootLoaderFile OBLUnreal.Bin ~

+ 5 - 5
source/Compiler.Mod
View File 

@@ -571,17 +571,17 @@ BEGIN
 
 	NEW(platforms);
 
 
 	(* platform definitions hard coded for the common cases -- maybe (parts of it) should be outsourced to a file ?*)
 
-	DoAddPlatform("Bios32","-b=AMD --newObjectFile --mergeSections --objectFileExtension=.Gof --symbolFileExtension=.SymG --preciseGC");
 
-	DoAddPlatform("Win32","-b=AMD --newObjectFile --mergeSections --objectFileExtension=.GofW --symbolFileExtension=.SymW --preciseGC --trackLeave --cellsAreObjects --platformCC=WINAPI");
 
+	DoAddPlatform("Bios32","-b=AMD --bits=32 --newObjectFile --mergeSections --objectFileExtension=.Gof --symbolFileExtension=.SymG --preciseGC");
 
+	DoAddPlatform("Win32","-b=AMD --bits=32 --newObjectFile --mergeSections --objectFileExtension=.GofW --symbolFileExtension=.SymW --preciseGC --trackLeave --cellsAreObjects --platformCC=WINAPI");
 
 	DoAddPlatform("Win64","-b=AMD --bits=64 --newObjectFile --mergeSections --objectFileExtension=.GofWw --symbolFileExtension=.SymWw --preciseGC --trackLeave --cellsAreObjects --platformCC=WINAPI");
 
-	DoAddPlatform("Win32C","-b=AMD --cooperative --newObjectFile --traceModule=Trace --objectFileExtension=.GofCW --symbolFileExtension=.SymCW --platformCC=WINAPI");
 
+	DoAddPlatform("Win32C","-b=AMD --bits=32 --cooperative --newObjectFile --traceModule=Trace --objectFileExtension=.GofCW --symbolFileExtension=.SymCW --platformCC=WINAPI");
 
 	DoAddPlatform("ARM","-b=ARM --newObjectFile --metaData=simple --objectFileExtension=.Goa --symbolFileExtension=.Sya");
 
 	DoAddPlatform("Minos","-b=ARM --objectFile=Minos"); 
 	DoAddPlatform("TRM","-b=TRM --objectFile=Generic --newObjectFile --metaData=simple --objectFileExtension=.GofT --symbolFileExtension=.SymT");
 
 	DoAddPlatform("TRMI","-b=TRM --objectFile=Intermediate --newObjectFile --metaData=simple --objectFileExtension=.IroT --symbolFileExtension=.IrsT");
 
-	DoAddPlatform("A2Coop","-b=AMD --cooperative --newObjectFile --traceModule=Trace --mergeSections");
 
+	DoAddPlatform("A2Coop","-b=AMD --bits=32 --cooperative --newObjectFile --traceModule=Trace --mergeSections");
 
 	DoAddPlatform("ARMA2","-b=ARM --newObjectFile --mergeSections");
 
-	DoAddPlatform("Linux32","-b=AMD --newObjectFile --mergeSections --traceModule=Trace --objectFileExtension=.GofU --symbolFileExtension=.SymU --preciseGC --cellsAreObjects --platformCC=C");
 
+	DoAddPlatform("Linux32","-b=AMD --bits=32 --newObjectFile --mergeSections --traceModule=Trace --objectFileExtension=.GofU --symbolFileExtension=.SymU --preciseGC --cellsAreObjects --platformCC=C");
 
 	DoAddPlatform("Linux64","-b=AMD --bits=64 --newObjectFile --mergeSections --traceModule=Trace --objectFileExtension=.GofUu --symbolFileExtension=.SymUu --preciseGC --cellsAreObjects --platformCC=C");
 
 	
 	SetupDefaults;

+ 1 - 1
source/EFI.Tool
View File 

@@ -15,7 +15,7 @@ Linker.Link --fileName=E:/felix.svn/qemu/disk/A2Loader.efi --fileFormat=EFI32 --
 
 ** Kernel Image **
 
 
 System.DoCommands
 
-Compiler.Compile --newObjectFile --mergeSections -b=AMD --objectFileExtension=.Gox --symbolFileExtension=.Syx --traceModule=Trace
 
+Compiler.Compile --newObjectFile --mergeSections -b=AMD --bits=32 --objectFileExtension=.Gox --symbolFileExtension=.Syx --traceModule=Trace
 
 	I386.Builtins.Mod Trace.Mod EFI.I386.Machine.Mod EFIGraphicalConsole.Mod StartConsole.Mod Heaps.Mod Modules.Mod 
 	BIOS.Objects.Mod Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod Commands.Mod I386.Reals.Mod 
 	Reflection.Mod TrapWriters.Mod CRC.Mod SystemVersion.Mod BIOS.I386.Traps.Mod Locks.Mod BIOS.PCI.Mod

+ 1 - 1
source/Windows.StdIO.Mod
View File 

@@ -66,7 +66,7 @@ END  StdIO.
 
 
 System.DoCommands 
 
-	Compiler.Compile  -b=AMD --newObjectFile  --objectFileExtension=.Gox --symbolFileExtension=.Syx --mergeSections
 
+	Compiler.Compile  -b=AMD --bits=32 --newObjectFile  --objectFileExtension=.Gox --symbolFileExtension=.Syx --mergeSections
 
 		I386.Builtins.Mod Trace.Mod Windows.I386.Kernel32.Mod Windows.I386.Machine.Mod Heaps.Mod 
 		Modules.Mod Windows.I386.Objects.Mod Windows.Kernel.Mod KernelLog.Mod Streams.Mod Commands.Mod 
 		I386.Reals.Mod Reflection.Mod Locks.Mod Windows.Clock.Mod Files.Mod Dates.Mod Strings.Mod