Browse Source

Renamed windows-specific modules that are architecture-dependent

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7996 8c9fc860-2736-0410-a75d-ab315db34111
eth.negelef 7 years ago
parent
commit
43d3475492

+ 3 - 3
source/Builds.Tool

@@ -27,10 +27,10 @@ WIN32 -- 32-bit windows a2
 FSTools.CloseFiles oberon.exe ~
 FSTools.CloseFiles oberon.exe ~
 
 
 Compiler.Compile -p=Win32
 Compiler.Compile -p=Win32
-Runtime.Mod Trace.Mod Win32.Kernel32.Mod Win32.Machine.Mod Heaps.Mod
-Modules.Mod Win32.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod
+Runtime.Mod Trace.Mod Win32.I386.Kernel32.Mod Win32.I386.Machine.Mod Heaps.Mod
+Modules.Mod Win32.I386.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod
 Commands.Mod In.Mod Out.Mod I386.Reals.Mod Reflection.Mod TrapWriters.Mod CRC.Mod
 Commands.Mod In.Mod Out.Mod I386.Reals.Mod Reflection.Mod TrapWriters.Mod CRC.Mod
-SystemVersion.Mod Win32.Traps.Mod Win32.WinTrace.Mod Win32.StdIO.Mod Locks.Mod Win32.Clock.Mod
+SystemVersion.Mod Win32.I386.Traps.Mod Win32.WinTrace.Mod Win32.StdIO.Mod Locks.Mod Win32.Clock.Mod
 Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod FileTrapWriter.Mod Caches.Mod
 Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod FileTrapWriter.Mod Caches.Mod
 DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod OberonFS.Mod
 DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod OberonFS.Mod
 FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod Win32.WinTrace.Mod
 FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod Win32.WinTrace.Mod

+ 0 - 0
source/Coop.Win32.Kernel32.Mod → source/Coop.Win32.I386.Kernel32.Mod


+ 3 - 3
source/FoxIntermediateBackend.Mod

@@ -14942,10 +14942,10 @@ FStols.CloseFiles A2Z.exe ~
 SystemTools.FreeDownTo FoxIntermediateBackend ~
 SystemTools.FreeDownTo FoxIntermediateBackend ~
 
 
 Compiler.Compile -p=Win32 --destPath=/temp/obg/ --traceModule=Trace
 Compiler.Compile -p=Win32 --destPath=/temp/obg/ --traceModule=Trace
-Runtime.Mod Trace.Mod Win32.Kernel32.Mod Win32.Machine.Mod Heaps.Mod 
-Modules.Mod Win32.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod 
+Runtime.Mod Trace.Mod Win32.I386.Kernel32.Mod Win32.I386.Machine.Mod Heaps.Mod 
+Modules.Mod Win32.I386.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod 
 Commands.Mod I386.Reals.Mod Reflection.Mod TrapWriters.Mod CRC.Mod SystemVersion.Mod 
 Commands.Mod I386.Reals.Mod Reflection.Mod TrapWriters.Mod CRC.Mod SystemVersion.Mod 
-Win32.Traps.Mod Locks.Mod Win32.Clock.Mod Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod 
+Win32.I386.Traps.Mod Locks.Mod Win32.Clock.Mod Disks.Mod Files.Mod Dates.Mod Strings.Mod UTF8Strings.Mod 
 FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod 
 FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod 
 OberonFS.Mod FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod 
 OberonFS.Mod FATVolumes.Mod FATFiles.Mod ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod 
 Win32.WinTrace.Mod Win32.ODBC.Mod Win32.Shell32.Mod Win32.SQL.Mod Win32.WinFS.Mod 
 Win32.WinTrace.Mod Win32.ODBC.Mod Win32.Shell32.Mod Win32.SQL.Mod Win32.WinFS.Mod 

+ 3 - 3
source/Heaps.Mod

@@ -2132,10 +2132,10 @@ Co
 
 
 
 
 Compiler.Compile -p=Win32 --writeBarriers --traceModule=Trace
 Compiler.Compile -p=Win32 --writeBarriers --traceModule=Trace
-Runtime.Mod Trace.Mod Win32.Kernel32.Mod Win32.Machine.Mod Heaps.Mod 
-Modules.Mod Win32.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod 
+Runtime.Mod Trace.Mod Win32.I386.Kernel32.Mod Win32.I386.Machine.Mod Heaps.Mod 
+Modules.Mod Win32.I386.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Plugins.Mod Streams.Mod Pipes.Mod 
 Commands.Mod I386.Reals.Mod Reflection.Mod
 Commands.Mod I386.Reals.Mod Reflection.Mod
-Win32.Traps.Mod Win32.WinTrace.Mod Win32.StdIO.Mod Locks.Mod Win32.Clock.Mod Disks.Mod Files.Mod 
+Win32.I386.Traps.Mod Win32.WinTrace.Mod Win32.StdIO.Mod Locks.Mod Win32.Clock.Mod Disks.Mod Files.Mod 
 Dates.Mod Strings.Mod UTF8Strings.Mod FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod 
 Dates.Mod Strings.Mod UTF8Strings.Mod FileTrapWriter.Mod Caches.Mod DiskVolumes.Mod 
 OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod OberonFS.Mod FATVolumes.Mod FATFiles.Mod 
 OldDiskVolumes.Mod RAMVolumes.Mod DiskFS.Mod OldDiskFS.Mod OberonFS.Mod FATVolumes.Mod FATFiles.Mod 
 ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod Win32.WinTrace.Mod Win32.ODBC.Mod 
 ISO9660Volumes.Mod ISO9660Files.Mod Win32.User32.Mod Win32.WinTrace.Mod Win32.ODBC.Mod 

+ 9 - 9
source/Release.Tool

@@ -245,7 +245,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	# cooperative runtime system
 	# cooperative runtime system
 	COOP { Counters.Mod }
 	COOP { Counters.Mod }
 	NATIVEI386COOP { I386.APIC.Mod APIC.Processors.Mod BIOS.ACPI.Mod ACPI.Timer.Mod }
 	NATIVEI386COOP { I386.APIC.Mod APIC.Processors.Mod BIOS.ACPI.Mod ACPI.Timer.Mod }
-	WINCOOP { Coop.Win32.Kernel32.Mod Win32.Processors.Mod Win32.Timer.Mod }
+	WINCOOP { Coop.Win32.I386.Kernel32.Mod Win32.Processors.Mod Win32.Timer.Mod }
 	RPICOOP { RPI.Processors.Mod RPI.Timer.Mod }
 	RPICOOP { RPI.Processors.Mod RPI.Timer.Mod }
 	ZYNQCOOP { Zynq.Processors.Mod Zynq.Timer.Mod }
 	ZYNQCOOP { Zynq.Processors.Mod Zynq.Timer.Mod }
 	COOP { Queues.Mod BaseTypes.Mod Activities.Mod ExclusiveBlocks.Mod Interrupts.Mod Coop.Runtime.Mod }
 	COOP { Queues.Mod BaseTypes.Mod Activities.Mod ExclusiveBlocks.Mod Interrupts.Mod Coop.Runtime.Mod }
@@ -261,12 +261,12 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	SOLARIS32 { Unix.I386.Glue.Mod Solaris.I386.Unix.Mod }
 	SOLARIS32 { Unix.I386.Glue.Mod Solaris.I386.Unix.Mod }
 	SOLARIS64 { Unix.AMD64.Glue.Mod Solaris.AMD64.Unix.Mod }
 	SOLARIS64 { Unix.AMD64.Glue.Mod Solaris.AMD64.Unix.Mod }
 
 
-	WIN32 { Win32.Kernel32.Mod }
-	WIN64 { Win64.Kernel32.Mod }
+	WIN32 { Win32.I386.Kernel32.Mod }
+	WIN64 { Win32.AMD64.Kernel32.Mod }
 
 
 	I386GEN { I386.Machine.Mod }
 	I386GEN { I386.Machine.Mod }
-	WIN32 { Win32.Machine.Mod }
-	WIN64 { Win64.Machine.Mod }
+	WIN32 { Win32.I386.Machine.Mod }
+	WIN64 { Win32.AMD64.Machine.Mod }
 	COOP { Mutexes.Mod }
 	COOP { Mutexes.Mod }
 	I386COOP { Coop.I386.Machine.Mod }
 	I386COOP { Coop.I386.Machine.Mod }
 	RPICOOP, ZYNQCOOP { Coop.ARM.Machine.Mod }
 	RPICOOP, ZYNQCOOP { Coop.ARM.Machine.Mod }
@@ -281,8 +281,8 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	COOP { Coop.Modules.Mod GarbageCollector.Mod }
 	COOP { Coop.Modules.Mod GarbageCollector.Mod }
 
 
 	NATIVE { Objects.Mod Kernel.Mod }
 	NATIVE { Objects.Mod Kernel.Mod }
-	WIN32 { Win32.Objects.Mod }
-	WIN64 { Win64.Objects.Mod }
+	WIN32 { Win32.I386.Objects.Mod }
+	WIN64 { Win32.AMD64.Objects.Mod }
 	WIN { Win32.Kernel.Mod }
 	WIN { Win32.Kernel.Mod }
 	UNIX { Unix.Objects.Mod Unix.Kernel.Mod }
 	UNIX { Unix.Objects.Mod Unix.Kernel.Mod }
 	COOP { Coop.Objects.Mod Coop.Kernel.Mod }
 	COOP { Coop.Objects.Mod Coop.Kernel.Mod }
@@ -308,8 +308,8 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	TrapWriters.Mod CRC.Mod SystemVersion.Mod
 	TrapWriters.Mod CRC.Mod SystemVersion.Mod
 	NATIVE { Traps.Mod }
 	NATIVE { Traps.Mod }
 	ARM { ARM.Traps.Mod }
 	ARM { ARM.Traps.Mod }
-	WIN32 { Win32.Traps.Mod }
-	WIN64 { Win64.Traps.Mod }
+	WIN32 { Win32.I386.Traps.Mod }
+	WIN64 { Win32.AMD64.Traps.Mod }
 	UNIX { Unix.StdIO.Mod Unix.Traps.Mod }
 	UNIX { Unix.StdIO.Mod Unix.Traps.Mod }
 	COOP { Coop.Traps.Mod }
 	COOP { Coop.Traps.Mod }
 	WIN { Win32.WinTrace.Mod Win32.StdIO.Mod }
 	WIN { Win32.WinTrace.Mod Win32.StdIO.Mod }

+ 0 - 0
source/Win64.Kernel32.Mod → source/Win32.AMD64.Kernel32.Mod


+ 0 - 0
source/Win64.Machine.Mod → source/Win32.AMD64.Machine.Mod


+ 0 - 0
source/Win64.Objects.Mod → source/Win32.AMD64.Objects.Mod


+ 0 - 0
source/Win64.Traps.Mod → source/Win32.AMD64.Traps.Mod


+ 0 - 0
source/Win32.Kernel32.Mod → source/Win32.I386.Kernel32.Mod


+ 0 - 0
source/Win32.Machine.Mod → source/Win32.I386.Machine.Mod


+ 0 - 0
source/Win32.Objects.Mod → source/Win32.I386.Objects.Mod


+ 0 - 0
source/Win32.Traps.Mod → source/Win32.I386.Traps.Mod


+ 2 - 2
source/Win32.StdIO.Mod

@@ -67,8 +67,8 @@ END  StdIO.
 SystemTools.DoCommands 
 SystemTools.DoCommands 
 
 
 	Compiler.Compile  -b=AMD --newObjectFile  --objectFileExtension=.Gox --symbolFileExtension=.Syx --mergeSections
 	Compiler.Compile  -b=AMD --newObjectFile  --objectFileExtension=.Gox --symbolFileExtension=.Syx --mergeSections
-		Runtime.Mod Trace.Mod Win32.Kernel32.Mod Win32.Machine.Mod Heaps.Mod 
-		Modules.Mod Win32.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Streams.Mod Commands.Mod 
+		Runtime.Mod Trace.Mod Win32.I386.Kernel32.Mod Win32.I386.Machine.Mod Heaps.Mod 
+		Modules.Mod Win32.I386.Objects.Mod Win32.Kernel.Mod KernelLog.Mod Streams.Mod Commands.Mod 
 		I386.Reals.Mod Reflection.Mod Locks.Mod Win32.Clock.Mod Files.Mod Dates.Mod Strings.Mod 
 		I386.Reals.Mod Reflection.Mod Locks.Mod Win32.Clock.Mod Files.Mod Dates.Mod Strings.Mod 
 
 
 		Win32.WinTrace.Mod Win32.WinFS.Mod 
 		Win32.WinTrace.Mod Win32.WinFS.Mod