浏览代码

rebuilt release

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7400 8c9fc860-2736-0410-a75d-ab315db34111
felixf 7 年之前
父节点
当前提交
fae0229636
共有 63 个文件被更改,包括 14 次插入12 次删除
  1. 二进制
      WinAos/A2.exe
  2. 二进制
      WinAos/oberon.exe
  3. 二进制
      WinAos/obg/BimboMail.GofW
  4. 二进制
      WinAos/obg/CharacterLineup.GofW
  5. 二进制
      WinAos/obg/DTPText.GofW
  6. 二进制
      WinAos/obg/DTPUtilities.GofW
  7. 二进制
      WinAos/obg/FoxARMAssembler.GofW
  8. 二进制
      WinAos/obg/FoxARMBackend.GofW
  9. 二进制
      WinAos/obg/FoxArrayBase.GofW
  10. 4 3
      WinAos/obg/FoxArrayBase.SymW
  11. 二进制
      WinAos/obg/FoxAssembler.GofW
  12. 二进制
      WinAos/obg/FoxBasic.GofW
  13. 2 0
      WinAos/obg/FoxBasic.SymW
  14. 二进制
      WinAos/obg/FoxDisassembler.GofW
  15. 二进制
      WinAos/obg/FoxIntermediateAssembler.GofW
  16. 二进制
      WinAos/obg/FoxIntermediateParser.GofW
  17. 二进制
      WinAos/obg/FoxScanner.GofW
  18. 0 1
      WinAos/obg/FoxScanner.SymW
  19. 二进制
      WinAos/obg/FoxTRMAssembler.GofW
  20. 二进制
      WinAos/obg/FoxTRMBackend.GofW
  21. 二进制
      WinAos/obg/FoxTest.GofW
  22. 二进制
      WinAos/obg/IMAPGUI.GofW
  23. 二进制
      WinAos/obg/Machine.GofW
  24. 二进制
      WinAos/obg/Oberon-Oberon.GofW
  25. 二进制
      WinAos/obg/PET.GofW
  26. 二进制
      WinAos/obg/Shell.GofW
  27. 1 0
      WinAos/obg/Shell.SymW
  28. 二进制
      WinAos/obg/ShellSerial.GofW
  29. 二进制
      WinAos/obg/SkinEditor.GofW
  30. 二进制
      WinAos/obg/Streams.GofW
  31. 二进制
      WinAos/obg/TFModuleTrees.GofW
  32. 二进制
      WinAos/obg/TFPET.GofW
  33. 二进制
      WinAos/obg/TestComponents.GofW
  34. 二进制
      WinAos/obg/WMArchives.GofW
  35. 二进制
      WinAos/obg/WMCharMap.GofW
  36. 二进制
      WinAos/obg/WMComponents.GofW
  37. 二进制
      WinAos/obg/WMDefaultFont.GofW
  38. 1 0
      WinAos/obg/WMDefaultFont.SymW
  39. 二进制
      WinAos/obg/WMDiagnostics.GofW
  40. 二进制
      WinAos/obg/WMDiff.GofW
  41. 二进制
      WinAos/obg/WMDropDownLists.GofW
  42. 二进制
      WinAos/obg/WMEventLog.GofW
  43. 二进制
      WinAos/obg/WMFTPClient.GofW
  44. 二进制
      WinAos/obg/WMFontCCGConverter.GofW
  45. 二进制
      WinAos/obg/WMGrids.GofW
  46. 1 1
      WinAos/obg/WMGrids.SymW
  47. 二进制
      WinAos/obg/WMOGGPlayer.GofW
  48. 二进制
      WinAos/obg/WMPartitions.GofW
  49. 二进制
      WinAos/obg/WMPartitionsComponents.GofW
  50. 二进制
      WinAos/obg/WMPerfMonComponents.GofW
  51. 二进制
      WinAos/obg/WMPerfMonTabAlerts.GofW
  52. 二进制
      WinAos/obg/WMPinyinIME.GofW
  53. 二进制
      WinAos/obg/WMProcessInfo.GofW
  54. 二进制
      WinAos/obg/WMRepositories.GofW
  55. 二进制
      WinAos/obg/WMShell.GofW
  56. 二进制
      WinAos/obg/WMStandardComponents.GofW
  57. 1 0
      WinAos/obg/WMStandardComponents.SymW
  58. 二进制
      WinAos/obg/WMStringGrids.GofW
  59. 二进制
      WinAos/obg/WMSystemComponents.GofW
  60. 二进制
      WinAos/obg/WMTCPTracker.GofW
  61. 二进制
      WinAos/obg/WMTextStyleTool.GofW
  62. 1 1
      source/Builds.Tool
  63. 3 6
      source/FoxArrayBase.Mod

二进制
WinAos/A2.exe


二进制
WinAos/oberon.exe


二进制
WinAos/obg/BimboMail.GofW


二进制
WinAos/obg/CharacterLineup.GofW


二进制
WinAos/obg/DTPText.GofW


二进制
WinAos/obg/DTPUtilities.GofW


二进制
WinAos/obg/FoxARMAssembler.GofW


二进制
WinAos/obg/FoxARMBackend.GofW


二进制
WinAos/obg/FoxArrayBase.GofW


+ 4 - 3
WinAos/obg/FoxArrayBase.SymW

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

二进制
WinAos/obg/FoxAssembler.GofW


二进制
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 ^ StringEqual*(s, t: String): BOOLEAN; 
 	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 ^ 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 ^ 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); 

二进制
WinAos/obg/FoxDisassembler.GofW


二进制
WinAos/obg/FoxIntermediateAssembler.GofW


二进制
WinAos/obg/FoxIntermediateParser.GofW


二进制
WinAos/obg/FoxScanner.GofW


+ 0 - 1
WinAos/obg/FoxScanner.SymW

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

二进制
WinAos/obg/FoxTRMAssembler.GofW


二进制
WinAos/obg/FoxTRMBackend.GofW


二进制
WinAos/obg/FoxTest.GofW


二进制
WinAos/obg/IMAPGUI.GofW


二进制
WinAos/obg/Machine.GofW


二进制
WinAos/obg/Oberon-Oberon.GofW


二进制
WinAos/obg/PET.GofW


二进制
WinAos/obg/Shell.GofW


+ 1 - 0
WinAos/obg/Shell.SymW

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

二进制
WinAos/obg/ShellSerial.GofW


二进制
WinAos/obg/SkinEditor.GofW


二进制
WinAos/obg/Streams.GofW


二进制
WinAos/obg/TFModuleTrees.GofW


二进制
WinAos/obg/TFPET.GofW


二进制
WinAos/obg/TestComponents.GofW


二进制
WinAos/obg/WMArchives.GofW


二进制
WinAos/obg/WMCharMap.GofW


二进制
WinAos/obg/WMComponents.GofW


二进制
WinAos/obg/WMDefaultFont.GofW


+ 1 - 0
WinAos/obg/WMDefaultFont.SymW

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

二进制
WinAos/obg/WMDiagnostics.GofW


二进制
WinAos/obg/WMDiff.GofW


二进制
WinAos/obg/WMDropDownLists.GofW


二进制
WinAos/obg/WMEventLog.GofW


二进制
WinAos/obg/WMFTPClient.GofW


二进制
WinAos/obg/WMFontCCGConverter.GofW


二进制
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 ^ FindCellXY*(x, y: LONGINT; VAR col, row: LONGINT); 
 		PROCEDURE ^ CheckScrollbarsNeeded; 
-		PROCEDURE ^ GetVisibleCellRect(col, row: LONGINT): WMRectangles.Rectangle; 
+		PROCEDURE ^ GetVisibleCellRect*(col, row: LONGINT): WMRectangles.Rectangle; 
 		PROCEDURE ^ DrawBackground*(canvas: Graphics.Canvas); 
 		PROCEDURE ^ InvalidateCell*(col, row: LONGINT); 
 		PROCEDURE ^ SetTopPosition*(col, row: LONGINT; updateScrollbar: BOOLEAN); 

二进制
WinAos/obg/WMOGGPlayer.GofW


二进制
WinAos/obg/WMPartitions.GofW


二进制
WinAos/obg/WMPartitionsComponents.GofW


二进制
WinAos/obg/WMPerfMonComponents.GofW


二进制
WinAos/obg/WMPerfMonTabAlerts.GofW


二进制
WinAos/obg/WMPinyinIME.GofW


二进制
WinAos/obg/WMProcessInfo.GofW


二进制
WinAos/obg/WMRepositories.GofW


二进制
WinAos/obg/WMShell.GofW


二进制
WinAos/obg/WMStandardComponents.GofW


+ 1 - 0
WinAos/obg/WMStandardComponents.SymW

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

二进制
WinAos/obg/WMStringGrids.GofW


二进制
WinAos/obg/WMSystemComponents.GofW


二进制
WinAos/obg/WMTCPTracker.GofW


二进制
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) ##
 	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;
 	TransposeP* = PROCEDURE ( ladr, dadr, lstride, linc, dstride, dinc, rows, cols: LONGINT );
 
-	LenInc = RECORD
-		len: SIZE;
-		inc: SIZE
+	LenInc* = RECORD
+		len*: SIZE;
+		inc*: SIZE
 	END;
 
 	ArrayDescriptor*= RECORD
@@ -9699,7 +9699,6 @@ TYPE
 				len := a[i];
 				PutInc( dest, i, size );  PutLen( dest, i, len );  size := size * len;
 			END;
-			TRACE(size,tag);
 			IF tag = 0 THEN
 				SYSTEM.NEW( data, size  + ArrayAlignment);   (* Zero(data,size*Size); *)
 				dest.adr := Align(data);
@@ -9718,7 +9717,6 @@ TYPE
 
 	BEGIN
 		dim := LEN( a,0 );
-		TRACE(dest, dim);
 		IF (dest = 0) OR (dim # GetDim( dest )) THEN
 			IF dest # 0 THEN
 				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 );
 	BEGIN
-		TRACE(elementSize);
 		AllocateTensorA(a,elementSize,tag,dest);
 		IF dest.ptr # NIL THEN Heaps.SetPC(dest.ptr) END;
 	END AllocateArrayA;