Sfoglia il codice sorgente

TRM code generation works for small example -- ports are not yet assigned in software and properties are still unset

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@6513 8c9fc860-2736-0410-a75d-ab315db34111
felixf 9 anni fa
parent
commit
1b4f36398e
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      source/FoxIntermediateLinker.Mod

+ 2 - 2
source/FoxIntermediateLinker.Mod

@@ -1270,7 +1270,7 @@ TYPE
 		END;
 	END Link;
 	
-	PROCEDURE WriteCodeAndDataFiles*(CONST instanceName: ARRAY OF CHAR; VAR instructionMemorySize, dataMemorySize: LONGINT; backend: Backend.Backend;  diagnostics: Diagnostics.Diagnostics; log:Streams.Writer): BOOLEAN;
+	PROCEDURE WriteCodeAndDataFiles*(CONST instanceName: ARRAY OF CHAR; objectFile: Formats.ObjectFileFormat; VAR instructionMemorySize, dataMemorySize: LONGINT; backend: Backend.Backend;  diagnostics: Diagnostics.Diagnostics; log:Streams.Writer): BOOLEAN;
 	VAR code, data: StaticLinker.Arrangement; linker: GenericLinker.Linker; linkerLog: Files.Writer;
 			logFile: Files.File; 
 			objectFileExtension: ARRAY 32 OF CHAR;
@@ -1286,7 +1286,7 @@ TYPE
 		COPY(instanceName, fileName); Strings.Append(fileName,".log");	logFile := Files.New(fileName);
 		IF logFile # NIL THEN NEW(linkerLog,logFile,0) ELSE logFile := NIL END;
 		NEW (linker, diagnostics, linkerLog, GenericLinker.UseInitCode, code, data);
-				StaticLinker.ReadObjectFile(instanceName, "",objectFileExtension,linker);
+		StaticLinker.ReadObjectFile(instanceName, "",objectFile.extension, linker);
 
 				(* do linking after having read in all blocks to account for potential constraints *)
 				IF ~linker.error THEN linker.Link; END;