Verified Commit a1c5fea9 authored by Camil Staps's avatar Camil Staps 🚀

Fix build; remove unused parameter from serialize_for_interpretation

parent ec37806b
Pipeline #16183 passed with stages
in 17 minutes and 19 seconds
......@@ -40,7 +40,7 @@ where
testThroughFile :: a !FilePath !*World -> *(a, !*World)
testThroughFile graph fp w
# (graph_s,w) = serialize_for_interpretation optimise_addition "./compiler" "./compiler.bc" w
# (graph_s,w) = serialize_for_interpretation optimise_addition "compiler.bc" w
# (ok,f,w) = fopen fp FWriteData w
# (graph_s,f) = graphToFile graph_s f
......@@ -50,4 +50,4 @@ testThroughFile graph fp w
# (Right graph_s,f) = graphFromFile f
# (_,w) = fclose f w
= deserialize graph_s "./compiler" w
= deserialize graph_s "compiler" w
......@@ -5,7 +5,7 @@ from System.FilePath import :: FilePath
:: *SerializedGraph
serialize_for_interpretation :: a !FilePath !FilePath !*World -> *(!SerializedGraph, !*World)
serialize_for_interpretation :: a !FilePath !*World -> *(!SerializedGraph, !*World)
deserialize :: !SerializedGraph !FilePath !*World -> *(a, !*World)
......
......@@ -42,12 +42,10 @@ import ABC.Interpreter.Util
, ie_snodes :: !*{a}
}
serialize_for_interpretation :: a !FilePath !FilePath !*World -> *(!SerializedGraph, !*World)
serialize_for_interpretation graph thisexe bcfile w
serialize_for_interpretation :: a !FilePath !*World -> *(!SerializedGraph, !*World)
serialize_for_interpretation graph bcfile w
# (graph,descs,mods) = copy_to_string_with_names graph
# (host_syms,w) = accFiles (read_symbols thisexe) w
# (bytecode,w) = readFile bcfile w
| isError bytecode = abort "Failed to read the bytecode file\n"
# bytecode = fromOk bytecode
......
......@@ -5,7 +5,7 @@ from Data.Func import hyperstrict
import ABC.Interpreter
Start w
# (graph,w) = serialize_for_interpretation graph "./GraphTest" "./GraphTest.bc" w
# (graph,w) = serialize_for_interpretation graph "GraphTest.bc" w
# ((intsquare,sub5,sub3_10,sumints,rev,foldr,ap1,ap3,map,reverse_string,reverse_array,reverse_boxed_array,reverse_recarr,recarr,toInt_rec,sumtup),w) = deserialize graph "./GraphTest" w
= use intsquare sub5 sub3_10 sumints rev foldr ap1 ap3 map reverse_string reverse_array reverse_boxed_array reverse_recarr recarr toInt_rec sumtup
where
......
......@@ -104,12 +104,10 @@ endif
all: $(BINARIES)
CodeSharing: $(OBJ_INTERPRET_LIB) $(PATCHED) .FORCE
cp $(OBJ_INTERPRET_LIB) Clean\ System\ Files
CodeSharing: library $(PATCHED) .FORCE
$(CLM) $(CLMFLAGS) $@ -o $@
GraphTest: $(OBJ_INTERPRET_LIB) $(PATCHED) .FORCE
cp $(OBJ_INTERPRET_LIB) Clean\ System\ Files
GraphTest: library $(PATCHED) .FORCE
$(CLM) -O -bytecode _system
$(CLM) $(CLMFLAGS) -exl -desc -bytecode -optabc -h 10m $@ -o $@
......@@ -139,6 +137,7 @@ $(INTERP): $(SRC_INTERPRET) $(DEP_INTERPRET)
$(CC) $(CFLAGS) $(CLIBS) -DINTERPRETER $(SRC_INTERPRET) -o $@
library: $(OBJ_INTERPRET_LIB)
cp $(OBJ_INTERPRET_LIB) Clean\ System\ Files
$(OBJ_INTERPRET_LIB): %.o: %.s
$(AS) $(ASFLAGS) $< -o $@
......@@ -162,4 +161,4 @@ clean:
find . -name '*.abc' -delete -or -name '*.obc' -delete -or -name '*.o' -delete
.FORCE:
.PHONY: all clean
.PHONY: all clean library
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment