瀏覽代碼

removed Ps filename prefix

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8608 8c9fc860-2736-0410-a75d-ab315db34111
eth.morozova 6 年之前
父節點
當前提交
535cff019a
共有 4 個文件被更改,包括 7 次插入7 次删除
  1. 1 1
      source/Linker.Mod
  2. 1 1
      source/Options.Mod
  3. 2 2
      source/Release.Tool
  4. 3 3
      source/Zynq.TraceDevice.Mod

+ 1 - 1
source/Linker.Mod

@@ -971,7 +971,7 @@ VAR options: Options.Options;
 	diagnostics: Diagnostics.StreamDiagnostics; code, data: Arrangement; linker: GenericLinker.Linker;
 	diagnostics: Diagnostics.StreamDiagnostics; code, data: Arrangement; linker: GenericLinker.Linker;
 	linkRoot: ARRAY 256 OF CHAR; logFile: Files.File; log: Files.Writer;
 	linkRoot: ARRAY 256 OF CHAR; logFile: Files.File; log: Files.Writer;
 	use: SET;
 	use: SET;
-	exportString: ARRAY 1024 OF CHAR;
+	exportString: ARRAY 1024*2 OF CHAR;
 	parsed: BOOLEAN;
 	parsed: BOOLEAN;
 	position: LONGINT;
 	position: LONGINT;
 	name: ARRAY 32 OF CHAR;
 	name: ARRAY 32 OF CHAR;

+ 1 - 1
source/Options.Mod

@@ -62,7 +62,7 @@ CONST
 TYPE
 TYPE
 
 
 	Name* = ARRAY 32 OF CHAR;
 	Name* = ARRAY 32 OF CHAR;
-	Parameter* = ARRAY 256 OF CHAR;
+	Parameter* = ARRAY 256*8 OF CHAR;
 
 
 	Option = RECORD
 	Option = RECORD
 		isSet : BOOLEAN;
 		isSet : BOOLEAN;

+ 2 - 2
source/Release.Tool

@@ -16,11 +16,11 @@
 #	Linker.Link --fileName=kernel.bin --extension=Gof --displacement=100000H Builtins Trace CPU Runtime Counters Processors Queues BaseTypes Timer Activities ExclusiveBlocks HeapManager Interrupts Environment Mutexes Machine Heaps Modules GarbageCollector Objects Kernel ~
 #	Linker.Link --fileName=kernel.bin --extension=Gof --displacement=100000H Builtins Trace CPU Runtime Counters Processors Queues BaseTypes Timer Activities ExclusiveBlocks HeapManager Interrupts Environment Mutexes Machine Heaps Modules GarbageCollector Objects Kernel ~
 #
 #
 # WINAOS
 # WINAOS
-#	Release.Build Win32 ~
+#	Release.Build --path=../newbin/ Win64 ~
 #	Linker.Link --fileFormat=PE32 --fileName=A2.exe --extension=GofW --displacement=401000H Builtins Trace Kernel32 Machine Heaps Modules Objects Kernel KernelLog Streams Commands Files WinFS Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker Reflection Loader BootConsole ~
 #	Linker.Link --fileFormat=PE32 --fileName=A2.exe --extension=GofW --displacement=401000H Builtins Trace Kernel32 Machine Heaps Modules Objects Kernel KernelLog Streams Commands Files WinFS Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker Reflection Loader BootConsole ~
 #	Do not forget to add the object file path to the path and to add ObjectFileExtension= ".ObfW" to your .ini file in order to configure the loader.
 #	Do not forget to add the object file path to the path and to add ObjectFileExtension= ".ObfW" to your .ini file in order to configure the loader.
 # Command line shell:
 # Command line shell:
-# Linker.Link --fileFormat=PE32CUI --fileName=oberon.exe --extension=GofW --displacement=401000H Builtins Trace Kernel32 Machine Heaps Modules Objects Kernel KernelLog Streams Commands Files WinFS Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker Reflection Loader WinTrace StdIO Traps RelativeFileSystem WMDefaultFont System StdIOShell ~
+# Linker.Link --path=../newbin/ --fileFormat=PE64CUI --fileName=oberon.exe --extension=GofWw --displacement=401000H Builtins Trace Kernel32 Machine Heaps Modules Objects Kernel KernelLog Streams Commands Files WinFS Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker Reflection Loader WinTrace StdIO Traps RelativeFileSystem WMDefaultFont System StdIOShell ~
 #
 #
 # LinuxAOS
 # LinuxAOS
 #	Release.Build Linux32 ~
 #	Release.Build Linux32 ~

+ 3 - 3
source/Zynq.PsTraceDevice.Mod → source/Zynq.TraceDevice.Mod

@@ -1,8 +1,8 @@
-MODULE TraceDevice;
 (**
 (**
-	AUTHOR: Timothee Martiel, Alexey Morozov, HighDim GmbH, 2013-2017
+	AUTHOR: Timothee Martiel, Alexey Morozov
 	PURPOSE: simple abtraction for installing kernel tracing over Zynq PS UART
 	PURPOSE: simple abtraction for installing kernel tracing over Zynq PS UART
 *)
 *)
+MODULE TraceDevice;
 
 
 IMPORT SYSTEM, Platform, BootConfig, Trace, PsUartMin;
 IMPORT SYSTEM, Platform, BootConfig, Trace, PsUartMin;
 
 
@@ -17,7 +17,7 @@ VAR
 
 
 	PROCEDURE Install *;
 	PROCEDURE Install *;
 	VAR
 	VAR
-		uartId: LONGINT;
+		uartId: PsUartMin.UartId;
 		res: WORD;
 		res: WORD;
 	BEGIN
 	BEGIN
 		Trace.Init;
 		Trace.Init;