Browse Source

rebuilt release

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7400 8c9fc860-2736-0410-a75d-ab315db34111
felixf 7 years ago
parent
commit
fae0229636
63 changed files with 14 additions and 12 deletions
  1. BIN
      WinAos/A2.exe
  2. BIN
      WinAos/oberon.exe
  3. BIN
      WinAos/obg/BimboMail.GofW
  4. BIN
      WinAos/obg/CharacterLineup.GofW
  5. BIN
      WinAos/obg/DTPText.GofW
  6. BIN
      WinAos/obg/DTPUtilities.GofW
  7. BIN
      WinAos/obg/FoxARMAssembler.GofW
  8. BIN
      WinAos/obg/FoxARMBackend.GofW
  9. BIN
      WinAos/obg/FoxArrayBase.GofW
  10. 4 3
      WinAos/obg/FoxArrayBase.SymW
  11. BIN
      WinAos/obg/FoxAssembler.GofW
  12. BIN
      WinAos/obg/FoxBasic.GofW
  13. 2 0
      WinAos/obg/FoxBasic.SymW
  14. BIN
      WinAos/obg/FoxDisassembler.GofW
  15. BIN
      WinAos/obg/FoxIntermediateAssembler.GofW
  16. BIN
      WinAos/obg/FoxIntermediateParser.GofW
  17. BIN
      WinAos/obg/FoxScanner.GofW
  18. 0 1
      WinAos/obg/FoxScanner.SymW
  19. BIN
      WinAos/obg/FoxTRMAssembler.GofW
  20. BIN
      WinAos/obg/FoxTRMBackend.GofW
  21. BIN
      WinAos/obg/FoxTest.GofW
  22. BIN
      WinAos/obg/IMAPGUI.GofW
  23. BIN
      WinAos/obg/Machine.GofW
  24. BIN
      WinAos/obg/Oberon-Oberon.GofW
  25. BIN
      WinAos/obg/PET.GofW
  26. BIN
      WinAos/obg/Shell.GofW
  27. 1 0
      WinAos/obg/Shell.SymW
  28. BIN
      WinAos/obg/ShellSerial.GofW
  29. BIN
      WinAos/obg/SkinEditor.GofW
  30. BIN
      WinAos/obg/Streams.GofW
  31. BIN
      WinAos/obg/TFModuleTrees.GofW
  32. BIN
      WinAos/obg/TFPET.GofW
  33. BIN
      WinAos/obg/TestComponents.GofW
  34. BIN
      WinAos/obg/WMArchives.GofW
  35. BIN
      WinAos/obg/WMCharMap.GofW
  36. BIN
      WinAos/obg/WMComponents.GofW
  37. BIN
      WinAos/obg/WMDefaultFont.GofW
  38. 1 0
      WinAos/obg/WMDefaultFont.SymW
  39. BIN
      WinAos/obg/WMDiagnostics.GofW
  40. BIN
      WinAos/obg/WMDiff.GofW
  41. BIN
      WinAos/obg/WMDropDownLists.GofW
  42. BIN
      WinAos/obg/WMEventLog.GofW
  43. BIN
      WinAos/obg/WMFTPClient.GofW
  44. BIN
      WinAos/obg/WMFontCCGConverter.GofW
  45. BIN
      WinAos/obg/WMGrids.GofW
  46. 1 1
      WinAos/obg/WMGrids.SymW
  47. BIN
      WinAos/obg/WMOGGPlayer.GofW
  48. BIN
      WinAos/obg/WMPartitions.GofW
  49. BIN
      WinAos/obg/WMPartitionsComponents.GofW
  50. BIN
      WinAos/obg/WMPerfMonComponents.GofW
  51. BIN
      WinAos/obg/WMPerfMonTabAlerts.GofW
  52. BIN
      WinAos/obg/WMPinyinIME.GofW
  53. BIN
      WinAos/obg/WMProcessInfo.GofW
  54. BIN
      WinAos/obg/WMRepositories.GofW
  55. BIN
      WinAos/obg/WMShell.GofW
  56. BIN
      WinAos/obg/WMStandardComponents.GofW
  57. 1 0
      WinAos/obg/WMStandardComponents.SymW
  58. BIN
      WinAos/obg/WMStringGrids.GofW
  59. BIN
      WinAos/obg/WMSystemComponents.GofW
  60. BIN
      WinAos/obg/WMTCPTracker.GofW
  61. BIN
      WinAos/obg/WMTextStyleTool.GofW
  62. 1 1
      source/Builds.Tool
  63. 3 6
      source/FoxArrayBase.Mod

BIN
WinAos/A2.exe


BIN
WinAos/oberon.exe


BIN
WinAos/obg/BimboMail.GofW


BIN
WinAos/obg/CharacterLineup.GofW


BIN
WinAos/obg/DTPText.GofW


BIN
WinAos/obg/DTPUtilities.GofW


BIN
WinAos/obg/FoxARMAssembler.GofW


BIN
WinAos/obg/FoxARMBackend.GofW


BIN
WinAos/obg/FoxArrayBase.GofW


+ 4 - 3
WinAos/obg/FoxArrayBase.SymW

@@ -16,6 +16,7 @@ CONST
 	GeometryMismatch = 400; 
 	GeometryMismatch = 400; 
 	DimensionMismatch = 401; 
 	DimensionMismatch = 401; 
 	AllocationForbidden = 402; 
 	AllocationForbidden = 402; 
+	ArrayAlignment = 8; 
 	TensorFlag = 0; 
 	TensorFlag = 0; 
 	RangeFlag = 1; 
 	RangeFlag = 1; 
 	TemporaryFlag = 2; 
 	TemporaryFlag = 2; 
@@ -89,9 +90,9 @@ TYPE
 
 
 	TransposeP* = PROCEDURE (ladr, dadr, lstride, linc, dstride, dinc, rows, cols: LONGINT); 
 	TransposeP* = PROCEDURE (ladr, dadr, lstride, linc, dstride, dinc, rows, cols: LONGINT); 
 
 
-	LenInc = RECORD 
-		len: SIZE; 
-		inc: SIZE; 
+	LenInc* = RECORD 
+		len*: SIZE; 
+		inc*: SIZE; 
 	END; 
 	END; 
 
 
 	ArrayDescriptor* = RECORD 
 	ArrayDescriptor* = RECORD 

BIN
WinAos/obg/FoxAssembler.GofW


BIN
WinAos/obg/FoxBasic.GofW


+ 2 - 0
WinAos/obg/FoxBasic.SymW

@@ -464,8 +464,10 @@ VAR
 	PROCEDURE ^ GetString*(s: String; VAR str: ARRAY OF CHAR); 
 	PROCEDURE ^ GetString*(s: String; VAR str: ARRAY OF CHAR); 
 	PROCEDURE ^ StringEqual*(s, t: String): BOOLEAN; 
 	PROCEDURE ^ StringEqual*(s, t: String): BOOLEAN; 
 	PROCEDURE ^ GetErrorMessage*(err: LONGINT; CONST msg: ARRAY OF CHAR; VAR res: ARRAY OF CHAR); 
 	PROCEDURE ^ GetErrorMessage*(err: LONGINT; CONST msg: ARRAY OF CHAR; VAR res: ARRAY OF CHAR); 
+	PROCEDURE ^ AppendDetailedErrorMessage*(VAR message: ARRAY OF CHAR; pos: Position; reader: Streams.Reader); 
 	PROCEDURE ^ AppendPosition*(VAR msg: ARRAY OF CHAR; pos: Position); 
 	PROCEDURE ^ AppendPosition*(VAR msg: ARRAY OF CHAR; pos: Position); 
 	PROCEDURE ^ MakeMessage(pos: Position; code: ErrorCode; CONST msg: ARRAY OF CHAR; VAR message: ARRAY OF CHAR); 
 	PROCEDURE ^ MakeMessage(pos: Position; code: ErrorCode; CONST msg: ARRAY OF CHAR; VAR message: ARRAY OF CHAR); 
+	PROCEDURE ^ MakeDetailedMessage(pos: Position; code: ErrorCode; CONST msg: ARRAY OF CHAR; reader: Streams.Reader; VAR message: ARRAY OF CHAR); 
 	PROCEDURE ^ ErrorC*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; code: ErrorCode; CONST msg: ARRAY OF CHAR); 
 	PROCEDURE ^ ErrorC*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; code: ErrorCode; CONST msg: ARRAY OF CHAR); 
 	PROCEDURE ^ Error*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; CONST msg: ARRAY OF CHAR); 
 	PROCEDURE ^ Error*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; CONST msg: ARRAY OF CHAR); 
 	PROCEDURE ^ Warning*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; CONST msg: ARRAY OF CHAR); 
 	PROCEDURE ^ Warning*(diagnostics: Diagnostics.Diagnostics; CONST source: ARRAY OF CHAR; pos: Position; CONST msg: ARRAY OF CHAR); 

BIN
WinAos/obg/FoxDisassembler.GofW


BIN
WinAos/obg/FoxIntermediateAssembler.GofW


BIN
WinAos/obg/FoxIntermediateParser.GofW


BIN
WinAos/obg/FoxScanner.GofW


+ 0 - 1
WinAos/obg/FoxScanner.SymW

@@ -238,7 +238,6 @@ TYPE
 		PROCEDURE ^ SetContext*(CONST context: Context); 
 		PROCEDURE ^ SetContext*(CONST context: Context); 
 		PROCEDURE ^ SkipToEndOfLine*; 
 		PROCEDURE ^ SkipToEndOfLine*; 
 		PROCEDURE ^ GetIdentifier(VAR symbol: Symbol); 
 		PROCEDURE ^ GetIdentifier(VAR symbol: Symbol); 
-		PROCEDURE ^ GetNumber(VAR symbol: Symbol): Token; 
 		PROCEDURE ^ GetNextSymbol*(VAR symbol: Symbol): BOOLEAN; 
 		PROCEDURE ^ GetNextSymbol*(VAR symbol: Symbol): BOOLEAN; 
 	END AssemblerScanner; 
 	END AssemblerScanner; 
 VAR 
 VAR 

BIN
WinAos/obg/FoxTRMAssembler.GofW


BIN
WinAos/obg/FoxTRMBackend.GofW


BIN
WinAos/obg/FoxTest.GofW


BIN
WinAos/obg/IMAPGUI.GofW


BIN
WinAos/obg/Machine.GofW


BIN
WinAos/obg/Oberon-Oberon.GofW


BIN
WinAos/obg/PET.GofW


BIN
WinAos/obg/Shell.GofW


+ 1 - 0
WinAos/obg/Shell.SymW

@@ -79,6 +79,7 @@ TYPE
 		prompt: ARRAY 32 OF CHAR; 
 		prompt: ARRAY 32 OF CHAR; 
 		upcall: NotifyProcedure; 
 		upcall: NotifyProcedure; 
 		commandHistory: CommandHistory; 
 		commandHistory: CommandHistory; 
+		firstCR: CHAR; 
 
 
 		PROCEDURE ^  & Init*(in: Streams.Reader; out, err: Streams.Writer; echo: BOOLEAN; CONST prompt: ARRAY OF CHAR); 
 		PROCEDURE ^  & Init*(in: Streams.Reader; out, err: Streams.Writer; echo: BOOLEAN; CONST prompt: ARRAY OF CHAR); 
 		PROCEDURE ^ Exit*; 
 		PROCEDURE ^ Exit*; 

BIN
WinAos/obg/ShellSerial.GofW


BIN
WinAos/obg/SkinEditor.GofW


BIN
WinAos/obg/Streams.GofW


BIN
WinAos/obg/TFModuleTrees.GofW


BIN
WinAos/obg/TFPET.GofW


BIN
WinAos/obg/TestComponents.GofW


BIN
WinAos/obg/WMArchives.GofW


BIN
WinAos/obg/WMCharMap.GofW


BIN
WinAos/obg/WMComponents.GofW


BIN
WinAos/obg/WMDefaultFont.GofW


+ 1 - 0
WinAos/obg/WMDefaultFont.SymW

@@ -1,6 +1,7 @@
 MODULE WMDefaultFont;
 MODULE WMDefaultFont;
 	IMPORT KernelLog, Streams, Graphics := WMGraphics, Raster;
 	IMPORT KernelLog, Streams, Graphics := WMGraphics, Raster;
 CONST 
 CONST 
+	TraceInstallation = FALSE; 
 TYPE 
 TYPE 
 	Glyph = RECORD 
 	Glyph = RECORD 
 		img: Graphics.Image; 
 		img: Graphics.Image; 

BIN
WinAos/obg/WMDiagnostics.GofW


BIN
WinAos/obg/WMDiff.GofW


BIN
WinAos/obg/WMDropDownLists.GofW


BIN
WinAos/obg/WMEventLog.GofW


BIN
WinAos/obg/WMFTPClient.GofW


BIN
WinAos/obg/WMFontCCGConverter.GofW


BIN
WinAos/obg/WMGrids.GofW


+ 1 - 1
WinAos/obg/WMGrids.SymW

@@ -106,7 +106,7 @@ TYPE
 		PROCEDURE ^ FindMasterCell*(x, y: LONGINT; VAR col, row, xpos, ypos: LONGINT); 
 		PROCEDURE ^ FindMasterCell*(x, y: LONGINT; VAR col, row, xpos, ypos: LONGINT); 
 		PROCEDURE ^ FindCellXY*(x, y: LONGINT; VAR col, row: LONGINT); 
 		PROCEDURE ^ FindCellXY*(x, y: LONGINT; VAR col, row: LONGINT); 
 		PROCEDURE ^ CheckScrollbarsNeeded; 
 		PROCEDURE ^ CheckScrollbarsNeeded; 
-		PROCEDURE ^ GetVisibleCellRect(col, row: LONGINT): WMRectangles.Rectangle; 
+		PROCEDURE ^ GetVisibleCellRect*(col, row: LONGINT): WMRectangles.Rectangle; 
 		PROCEDURE ^ DrawBackground*(canvas: Graphics.Canvas); 
 		PROCEDURE ^ DrawBackground*(canvas: Graphics.Canvas); 
 		PROCEDURE ^ InvalidateCell*(col, row: LONGINT); 
 		PROCEDURE ^ InvalidateCell*(col, row: LONGINT); 
 		PROCEDURE ^ SetTopPosition*(col, row: LONGINT; updateScrollbar: BOOLEAN); 
 		PROCEDURE ^ SetTopPosition*(col, row: LONGINT; updateScrollbar: BOOLEAN); 

BIN
WinAos/obg/WMOGGPlayer.GofW


BIN
WinAos/obg/WMPartitions.GofW


BIN
WinAos/obg/WMPartitionsComponents.GofW


BIN
WinAos/obg/WMPerfMonComponents.GofW


BIN
WinAos/obg/WMPerfMonTabAlerts.GofW


BIN
WinAos/obg/WMPinyinIME.GofW


BIN
WinAos/obg/WMProcessInfo.GofW


BIN
WinAos/obg/WMRepositories.GofW


BIN
WinAos/obg/WMShell.GofW


BIN
WinAos/obg/WMStandardComponents.GofW


+ 1 - 0
WinAos/obg/WMStandardComponents.SymW

@@ -445,6 +445,7 @@ VAR
 	PROCEDURE ^ GenCheckbox*(): XML.Element; 
 	PROCEDURE ^ GenCheckbox*(): XML.Element; 
 	PROCEDURE ^ GenGroupPanel*(): XML.Element; 
 	PROCEDURE ^ GenGroupPanel*(): XML.Element; 
 	PROCEDURE ^ GenImage*(): XML.Element; 
 	PROCEDURE ^ GenImage*(): XML.Element; 
+	PROCEDURE ^ GenImagePanel*(): XML.Element; 
 	PROCEDURE ^ FindLabel*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Label; 
 	PROCEDURE ^ FindLabel*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Label; 
 	PROCEDURE ^ FindButton*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Button; 
 	PROCEDURE ^ FindButton*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Button; 
 	PROCEDURE ^ FindCheckbox*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Checkbox; 
 	PROCEDURE ^ FindCheckbox*(CONST uid: ARRAY OF CHAR; component: WMComponents.Component): Checkbox; 

BIN
WinAos/obg/WMStringGrids.GofW


BIN
WinAos/obg/WMSystemComponents.GofW


BIN
WinAos/obg/WMTCPTracker.GofW


BIN
WinAos/obg/WMTextStyleTool.GofW


+ 1 - 1
source/Builds.Tool

@@ -22,5 +22,5 @@ LINUX32G -- 32 bit linux a2 using generic object files
 	
 	
 	## Command line shell including compiler (and linker) ##
 	## Command line shell including compiler (and linker) ##
 	StaticLinker.Link -p=Linux32G Runtime Trace Glue Unix Machine Heaps Modules Objects Kernel KernelLog  Streams Commands Pipes StdIO TrapWriters Reflection Traps Files UnixFiles Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker   GenericLoader  SystemTools StdIOShell 
 	StaticLinker.Link -p=Linux32G Runtime Trace Glue Unix Machine Heaps Modules Objects Kernel KernelLog  Streams Commands Pipes StdIO TrapWriters Reflection Traps Files UnixFiles Clock Dates Reals Strings Diagnostics BitSets StringPool ObjectFile GenericLinker   GenericLoader  SystemTools StdIOShell 
-	Shell StaticLinker Compiler FoxOberonFrontend FoxARMBackend FoxAMDBackend
+	Shell StaticLinker Compiler FoxOberonFrontend FoxARMBackend FoxAMDBackend ~
 
 

+ 3 - 6
source/FoxArrayBase.Mod

@@ -91,9 +91,9 @@ TYPE
 	FastMatMul* = PROCEDURE ( matrixA, matrixB, matrixC, IncA, StrideA, IncB, StrideB, IncC, StrideC, RowsA, ColsA, RowsB, ColsB: LONGINT ): BOOLEAN;
 	FastMatMul* = PROCEDURE ( matrixA, matrixB, matrixC, IncA, StrideA, IncB, StrideB, IncC, StrideC, RowsA, ColsA, RowsB, ColsB: LONGINT ): BOOLEAN;
 	TransposeP* = PROCEDURE ( ladr, dadr, lstride, linc, dstride, dinc, rows, cols: LONGINT );
 	TransposeP* = PROCEDURE ( ladr, dadr, lstride, linc, dstride, dinc, rows, cols: LONGINT );
 
 
-	LenInc = RECORD
-		len: SIZE;
-		inc: SIZE
+	LenInc* = RECORD
+		len*: SIZE;
+		inc*: SIZE
 	END;
 	END;
 
 
 	ArrayDescriptor*= RECORD
 	ArrayDescriptor*= RECORD
@@ -9699,7 +9699,6 @@ TYPE
 				len := a[i];
 				len := a[i];
 				PutInc( dest, i, size );  PutLen( dest, i, len );  size := size * len;
 				PutInc( dest, i, size );  PutLen( dest, i, len );  size := size * len;
 			END;
 			END;
-			TRACE(size,tag);
 			IF tag = 0 THEN
 			IF tag = 0 THEN
 				SYSTEM.NEW( data, size  + ArrayAlignment);   (* Zero(data,size*Size); *)
 				SYSTEM.NEW( data, size  + ArrayAlignment);   (* Zero(data,size*Size); *)
 				dest.adr := Align(data);
 				dest.adr := Align(data);
@@ -9718,7 +9717,6 @@ TYPE
 
 
 	BEGIN
 	BEGIN
 		dim := LEN( a,0 );
 		dim := LEN( a,0 );
-		TRACE(dest, dim);
 		IF (dest = 0) OR (dim # GetDim( dest )) THEN
 		IF (dest = 0) OR (dim # GetDim( dest )) THEN
 			IF dest # 0 THEN
 			IF dest # 0 THEN
 				IF (~(TensorFlag IN GetFlags( dest ))) THEN Err( "Array's number of dimension must not be modified (no TENSOR !)" );  END;
 				IF (~(TensorFlag IN GetFlags( dest ))) THEN Err( "Array's number of dimension must not be modified (no TENSOR !)" );  END;
@@ -9745,7 +9743,6 @@ TYPE
 
 
 	PROCEDURE AllocateArrayA*( CONST a: ARRAY OF SIZE;  elementSize: SIZE; tag: ADDRESS; dest: UnsafeArray );
 	PROCEDURE AllocateArrayA*( CONST a: ARRAY OF SIZE;  elementSize: SIZE; tag: ADDRESS; dest: UnsafeArray );
 	BEGIN
 	BEGIN
-		TRACE(elementSize);
 		AllocateTensorA(a,elementSize,tag,dest);
 		AllocateTensorA(a,elementSize,tag,dest);
 		IF dest.ptr # NIL THEN Heaps.SetPC(dest.ptr) END;
 		IF dest.ptr # NIL THEN Heaps.SetPC(dest.ptr) END;
 	END AllocateArrayA;
 	END AllocateArrayA;