Explorar el Código

rebuilt release Win32G

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7848 8c9fc860-2736-0410-a75d-ab315db34111
felixf hace 7 años
padre
commit
e19a965f40

BIN
WinAos/A2.exe


BIN
WinAos/oberon.exe


BIN
WinAos/obg/Compiler.GofW


BIN
WinAos/obg/FoxAMD64Assembler.GofW


BIN
WinAos/obg/FoxAMD64InstructionSet.GofW


+ 0 - 22
WinAos/obg/FoxAMD64InstructionSet.SymW

@@ -379,28 +379,6 @@ VAR
 	PROCEDURE ^ IsImmediate16*(operandType: OperandType): BOOLEAN; 
 	PROCEDURE ^ IsImmediate32*(operandType: OperandType): BOOLEAN; 
 	PROCEDURE ^ IsImmediate64*(operandType: OperandType): BOOLEAN; 
-	PROCEDURE ^ IsRegister8*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ Register8*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsRegister8Low*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ IsRegister8High*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ Register16*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsRegister16*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ Register32*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsRegister32*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ Register64*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsRegister64*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ CounterRegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsCounterRegister*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ DebugRegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsDebugRegister*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ SegmentRegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsSegmentRegister*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ MMXRegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsMMXRegister*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ SSERegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsSSERegister*(index: LONGINT): BOOLEAN; 
-	PROCEDURE ^ FPRegister*(index: SHORTINT): LONGINT; 
-	PROCEDURE ^ IsFPRegister*(index: LONGINT): BOOLEAN; 
 	PROCEDURE ^ InitRegisters; 
 	PROCEDURE ^ InitCPUs; 
 	PROCEDURE ^ Trace*; 

BIN
WinAos/obg/FoxArrayBase.GofW


+ 4 - 2
WinAos/obg/FoxArrayBase.SymW

@@ -4,7 +4,7 @@ CONST
 	debug = FALSE; 
 	statistics = FALSE; 
 	conservative = TRUE; 
-	ArrDataArrayOffset = ADDRESS(16); 
+	ArrDataArrayOffset = (4 * SIZEOF(ADDRESS)); 
 	AddressSize = SIZEOF(ADDRESS); 
 	MathPtrOffset = (0 * AddressSize); 
 	MathAdrOffset = (1 * AddressSize); 
@@ -303,6 +303,8 @@ VAR
 	OPERATOR ^ "@Convert"-(CONST src: ARRAY [?] OF LONGINT): ARRAY [?] OF SIZE; 
 	PROCEDURE ^ ConvertLoopYZ(ladr, dadr: ADDRESS; linc, dinc, len: SIZE); 
 	OPERATOR ^ "@Convert"-(CONST src: ARRAY [?] OF SIZE): ARRAY [?] OF LONGREAL; 
+	PROCEDURE ^ ConvertLoopYR(ladr, dadr: ADDRESS; linc, dinc, len: SIZE); 
+	OPERATOR ^ "@Convert"-(CONST src: ARRAY [?] OF SIZE): ARRAY [?] OF REAL; 
 	PROCEDURE ^ NotLoopAB(ladr, dadr: ADDRESS; linc, dinc, len: SIZE); 
 	OPERATOR ^ "~"-(CONST src: ARRAY [?] OF BOOLEAN): ARRAY [?] OF BOOLEAN; 
 	PROCEDURE ^ GenericLoopS(ladr, dadr: ADDRESS; linc, dinc, len: SIZE; op: PROCEDURE (x: SHORTINT):SHORTINT); 
@@ -1003,7 +1005,7 @@ VAR
 	OPERATOR ^ "MAX"-(CONST left: ARRAY [?] OF REAL): REAL; 
 	PROCEDURE ^ MaxAXLoop(ladr, dadr: ADDRESS; linc, len: SIZE); 
 	OPERATOR ^ "MAX"-(CONST left: ARRAY [?] OF LONGREAL): LONGREAL; 
-	OPERATOR ^ "LEN"-(CONST left: ARRAY [?] ): ARRAY [*] OF LenType; 
+	OPERATOR ^ "LEN"-(CONST left: ARRAY [?] ): ARRAY [*] OF SIZE; 
 	PROCEDURE ^ SumASLoop(ladr, dadr: ADDRESS; linc, len: SIZE); 
 	OPERATOR ^ "SUM"-(CONST left: ARRAY [?] OF SHORTINT): SHORTINT; 
 	PROCEDURE ^ SumAILoop(ladr, dadr: ADDRESS; linc, len: SIZE); 

BIN
WinAos/obg/FoxSemanticChecker.GofW


+ 1 - 0
WinAos/obg/FoxSemanticChecker.SymW

@@ -57,6 +57,7 @@ TYPE
 		system-: Global.System; 
 		symbolFileFormat-: Formats.SymbolFileFormat; 
 		backendName-: ARRAY 32 OF CHAR; 
+		inConversion: LONGINT; 
 		resolvedType: SyntaxTree.Type; 
 		resolvedExpression: SyntaxTree.Expression; 
 		resolvedStatement: SyntaxTree.Statement; 

BIN
WinAos/obg/Heaps.GofW


BIN
WinAos/obg/Kernel32.GofW


BIN
WinAos/obg/Machine.GofW


BIN
WinAos/obg/Oberon-Bitmaps.GofW


+ 1 - 2
WinAos/obg/Oberon-Bitmaps.SymW

@@ -8,9 +8,8 @@ TYPE
 
 	BitmapDesc* = RECORD 
 		width*, height*, depth*: INTEGER; 
-		wth*: LONGINT; 
+		wth*, size: LONGINT; 
 		address*: ADDRESS; 
-		size: LONGINT; 
 	END; 
 
 	Buffer = RECORD 

BIN
WinAos/obg/Oberon-Display.GofW


BIN
WinAos/obg/Oberon-Examples.GofW


BIN
WinAos/obg/Oberon-FATTools.GofW


BIN
WinAos/obg/Oberon-Fonts.GofW


+ 4 - 4
WinAos/obg/Oberon-Fonts.SymW

@@ -2,7 +2,7 @@ MODULE Fonts IN Oberon;
 	IMPORT SYSTEM, Kernel, Files, Objects, Display, OberonFonts IN A2;
 CONST 
 	MaxRuns = 32; 
-	IndexSize = (256 * 4); 
+	IndexSize = (256 *  SIZE OF ADDRESS); 
 	substitute* =  -1; 
 	font* = 0; 
 	metric* = 1; 
@@ -36,9 +36,9 @@ VAR
 	theChar: Char; 
 	conv: BOOLEAN; 
 
-	PROCEDURE ^ Put1(VAR a: LONGINT; x: INTEGER); 
-	PROCEDURE ^ Put2(VAR a: LONGINT; x: LONGINT); 
-	PROCEDURE ^ Put4(VAR a: LONGINT; x: LONGINT); 
+	PROCEDURE ^ Put1(VAR a: ADDRESS; x: INTEGER); 
+	PROCEDURE ^ Put2(VAR a: ADDRESS; x: LONGINT); 
+	PROCEDURE ^ PutAdr(VAR a: ADDRESS; x: ADDRESS); 
 	PROCEDURE ^ ReadInt(VAR R: Files.Rider; VAR x: INTEGER); 
 	PROCEDURE ^ GetCharObj(L: Objects.Library; ref: INTEGER; VAR obj: Objects.Object); 
 	PROCEDURE ^ GetChar*(F: Font; ch: CHAR; VAR dx, x, y, w, h: INTEGER; VAR pat: Display.Pattern); 

BIN
WinAos/obg/Oberon-OPT.GofW


BIN
WinAos/obg/Oberon-Pictures.GofW


BIN
WinAos/obg/Oberon-Rembrandt.GofW


BIN
WinAos/obg/Oberon-Rembrandt0.GofW


BIN
WinAos/obg/Oberon-System.GofW


BIN
WinAos/obg/Oberon-vyGraphBase0.GofW


BIN
WinAos/obg/ShellSerial.GofW


+ 1 - 2
WinAos/obg/ShellSerial.SymW

@@ -1,12 +1,11 @@
 MODULE ShellSerial;
-	IMPORT Modules, Kernel, Commands, Streams, Files, Serials, Shell, Objects, XYModem;
+	IMPORT Modules, Kernel, Commands, Streams, Files, Serials, Shell, XYModem;
 CONST 
 	BufferSize = 1024; 
 	DefaultPrompt = \"SHELL>"\; 
 VAR 
 	shells: ARRAY (Serials.MaxPorts + 1) OF Shell.Shell; 
 
-	PROCEDURE ^ Yield(): BOOLEAN; 
 	PROCEDURE ^ ModemReceive(context: Commands.Context; modemMode: LONGINT); 
 	PROCEDURE ^ XReceive*(context: Commands.Context); 
 	PROCEDURE ^ YReceive*(context: Commands.Context); 

BIN
WinAos/obg/WMSlideshow.GofW


BIN
WinAos/obg/WMV24Component.GofW


BIN
WinAos/obg/XYModem.GofW


+ 1 - 17
WinAos/obg/XYModem.SymW

@@ -13,17 +13,6 @@ CONST
 	XModem1K* = 1; 
 	YModem* = 2; 
 	DoYield = TRUE; 
-	TimeoutExpired = 1; 
-	CorruptedData = 2; 
-	InvalidHeader = 3; 
-	InvalidBlockNum = 4; 
-	TransferAborted = 5; 
-	EotError = 6; 
-	ModemIoError = 7; 
-	DataIoError = 8; 
-	FileNameUnspecified = 9; 
-	CreateFileFailure = 10; 
-	MaxNakCount = 3; 
 TYPE 
 	Modem* = OBJECT {EXCLUSIVE} 
 	VAR 
@@ -42,7 +31,7 @@ TYPE
 		PROCEDURE ^ Await*(VAR err: ARRAY OF CHAR); 
 		PROCEDURE ^ AwaitF*(VAR F: Files.File; VAR err: ARRAY OF CHAR); 
 		PROCEDURE ^ Stop; 
-		PROCEDURE ^ ReadChar(VAR ch: CHAR): BOOLEAN; 
+		PROCEDURE ^ Read(VAR ch: CHAR): BOOLEAN; 
 	END Modem; 
 
 	Sender* = OBJECT {EXCLUSIVE} (Modem)
@@ -59,11 +48,6 @@ TYPE
 	BEGIN{ACTIVE} 
 	END Receiver; 
 
-	PROCEDURE ^ WaitForData(reader: Streams.Reader; minAvailable, timeout: LONGINT; yield: PROCEDURE {DELEGATE}():BOOLEAN): BOOLEAN; 
-	PROCEDURE ^ AbortTransfer(modemWriter: Streams.Writer); 
-	PROCEDURE ^ InitReceiveTransfer(modemReader: Streams.Reader; modemWriter: Streams.Writer; mode, initTimeout, dataTimeout: LONGINT; yield: PROCEDURE {DELEGATE}():BOOLEAN; VAR fileName: ARRAY OF CHAR; VAR fileLength: LONGINT; VAR res: LONGINT); 
-	PROCEDURE ^ ReceiveFileData(modemReader: Streams.Reader; modemWriter, dataWriter: Streams.Writer; mode, length, timeout: LONGINT; yield: PROCEDURE {DELEGATE}():BOOLEAN; VAR numBytesReceived: LONGINT; VAR res: LONGINT); 
-	PROCEDURE ^ Receive*(modemReader: Streams.Reader; modemWriter: Streams.Writer; VAR fileName: Files.FileName; mode: LONGINT; initTimeout, dataTimeout: LONGINT; VAR numBytesReceived: LONGINT; yield: PROCEDURE {DELEGATE}():BOOLEAN; VAR res: LONGINT); 
 	PROCEDURE ^ IsDigit(ch: CHAR): BOOLEAN; 
 	PROCEDURE ^ CRC16(VAR buf: ARRAY OF CHAR; len: LONGINT): LONGINT; 
 	PROCEDURE ^ GetPars(context: Commands.Context; VAR name: ARRAY OF CHAR; VAR port, bps, parity, stop: LONGINT): BOOLEAN;