From 040115e81289697b238cbce5c34d1b5d42229da5 Mon Sep 17 00:00:00 2001 From: ridethepig Date: Mon, 27 Mar 2023 19:21:05 +0800 Subject: [PATCH] first compile PA5 --- .gitignore | 20 ++++++++++++++------ assignments/PA5/Makefile | 2 +- assignments/PA5/ast-lex.d | 5 ----- assignments/PA5/ast-parse.d | 6 ------ assignments/PA5/cgen-phase.d | 6 ------ assignments/PA5/cgen.d | 6 ------ assignments/PA5/cgen_supp.d | 3 --- assignments/PA5/cool-tree.d | 5 ----- assignments/PA5/dumptype.d | 6 ------ assignments/PA5/emit.h | 4 ++-- assignments/PA5/handle_flags.d | 3 --- assignments/PA5/mycoolc | 2 +- assignments/PA5/stdcoolc | 2 ++ assignments/PA5/stringtab.d | 4 ---- assignments/PA5/tree.d | 3 --- assignments/PA5/utilities.d | 6 ------ 16 files changed, 20 insertions(+), 63 deletions(-) delete mode 100644 assignments/PA5/ast-lex.d delete mode 100644 assignments/PA5/ast-parse.d delete mode 100644 assignments/PA5/cgen-phase.d delete mode 100644 assignments/PA5/cgen.d delete mode 100644 assignments/PA5/cgen_supp.d delete mode 100644 assignments/PA5/cool-tree.d delete mode 100644 assignments/PA5/dumptype.d delete mode 100644 assignments/PA5/handle_flags.d create mode 100755 assignments/PA5/stdcoolc delete mode 100644 assignments/PA5/stringtab.d delete mode 100644 assignments/PA5/tree.d delete mode 100644 assignments/PA5/utilities.d diff --git a/.gitignore b/.gitignore index 2d9cfcf..3d6e63d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,16 @@ *.s +*.o +.cache/ +*.d +grading/ +compile_commands.json + assignments/PA2/cgen assignments/PA2/cool-lex.cc assignments/PA2/parser assignments/PA2/semant assignments/PA2/lexer -*.o -.cache/ -compile_commands.json + assignments/PA3/cgen assignments/PA3/parser assignments/PA3/semant @@ -14,9 +18,13 @@ assignments/PA3/lexer assignments/PA3/cool.output assignments/PA3/cool.tab.h assignments/PA3/cool-parse.cc -*.d -grading/ + assignments/PA4/cgen assignments/PA4/parser assignments/PA4/semant -assignments/PA4/lexer \ No newline at end of file +assignments/PA4/lexer + +assignments/PA5/cgen +assignments/PA5/parser +assignments/PA5/semant +assignments/PA5/lexer \ No newline at end of file diff --git a/assignments/PA5/Makefile b/assignments/PA5/Makefile index 1eea6b2..f81164f 100644 --- a/assignments/PA5/Makefile +++ b/assignments/PA5/Makefile @@ -26,7 +26,7 @@ FFLAGS = -d8 -ocool-lex.cc BFLAGS = -d -v -y -b cool --debug -p cool_yy CC=g++ -CFLAGS=-g -Wall -Wno-unused -Wno-write-strings -Wno-deprecated ${CPPINCLUDE} -DDEBUG +CFLAGS=-g -Wall -Wno-unused -Wno-write-strings -Wno-deprecated ${CPPINCLUDE} -DDEBUG -std=c++11 FLEX=flex ${FFLAGS} BISON= bison ${BFLAGS} DEPEND = ${CC} -MM ${CPPINCLUDE} diff --git a/assignments/PA5/ast-lex.d b/assignments/PA5/ast-lex.d deleted file mode 100644 index 2c0b760..0000000 --- a/assignments/PA5/ast-lex.d +++ /dev/null @@ -1,5 +0,0 @@ -ast-lex.o ast-lex.d : ast-lex.cc ../../include/PA5/ast-parse.h \ - ../../include/PA5/copyright.h ../../include/PA5/cool-io.h \ - ../../include/PA5/tree.h ../../include/PA5/stringtab.h \ - ../../include/PA5/list.h ../../include/PA5/stringtab.h \ - ../../include/PA5/utilities.h diff --git a/assignments/PA5/ast-parse.d b/assignments/PA5/ast-parse.d deleted file mode 100644 index cb1a86e..0000000 --- a/assignments/PA5/ast-parse.d +++ /dev/null @@ -1,6 +0,0 @@ -ast-parse.o ast-parse.d : ast-parse.cc ../../include/PA5/cool-io.h \ - ../../include/PA5/copyright.h cool-tree.h ../../include/PA5/tree.h \ - ../../include/PA5/stringtab.h ../../include/PA5/list.h \ - ../../include/PA5/cool-io.h cool-tree.handcode.h \ - ../../include/PA5/cool.h ../../include/PA5/stringtab.h \ - ../../include/PA5/utilities.h diff --git a/assignments/PA5/cgen-phase.d b/assignments/PA5/cgen-phase.d deleted file mode 100644 index bcfbab8..0000000 --- a/assignments/PA5/cgen-phase.d +++ /dev/null @@ -1,6 +0,0 @@ -cgen-phase.o cgen-phase.d : cgen-phase.cc ../../include/PA5/cool-io.h \ - ../../include/PA5/copyright.h cool-tree.h ../../include/PA5/tree.h \ - ../../include/PA5/stringtab.h ../../include/PA5/list.h \ - ../../include/PA5/cool-io.h cool-tree.handcode.h \ - ../../include/PA5/cool.h ../../include/PA5/stringtab.h \ - ../../include/PA5/cgen_gc.h diff --git a/assignments/PA5/cgen.d b/assignments/PA5/cgen.d deleted file mode 100644 index 8fffe3b..0000000 --- a/assignments/PA5/cgen.d +++ /dev/null @@ -1,6 +0,0 @@ -cgen.o cgen.d : cgen.cc cgen.h emit.h ../../include/PA5/stringtab.h \ - ../../include/PA5/copyright.h ../../include/PA5/list.h \ - ../../include/PA5/cool-io.h cool-tree.h ../../include/PA5/tree.h \ - ../../include/PA5/stringtab.h cool-tree.handcode.h \ - ../../include/PA5/cool.h ../../include/PA5/symtab.h \ - ../../include/PA5/cgen_gc.h diff --git a/assignments/PA5/cgen_supp.d b/assignments/PA5/cgen_supp.d deleted file mode 100644 index 3bc9079..0000000 --- a/assignments/PA5/cgen_supp.d +++ /dev/null @@ -1,3 +0,0 @@ -cgen_supp.o cgen_supp.d : cgen_supp.cc ../../include/PA5/stringtab.h \ - ../../include/PA5/copyright.h ../../include/PA5/list.h \ - ../../include/PA5/cool-io.h diff --git a/assignments/PA5/cool-tree.d b/assignments/PA5/cool-tree.d deleted file mode 100644 index 3f313bb..0000000 --- a/assignments/PA5/cool-tree.d +++ /dev/null @@ -1,5 +0,0 @@ -cool-tree.o cool-tree.d : cool-tree.cc ../../include/PA5/tree.h \ - ../../include/PA5/copyright.h ../../include/PA5/stringtab.h \ - ../../include/PA5/list.h ../../include/PA5/cool-io.h \ - cool-tree.handcode.h ../../include/PA5/cool.h \ - ../../include/PA5/stringtab.h cool-tree.h diff --git a/assignments/PA5/dumptype.d b/assignments/PA5/dumptype.d deleted file mode 100644 index 5c7f1a9..0000000 --- a/assignments/PA5/dumptype.d +++ /dev/null @@ -1,6 +0,0 @@ -dumptype.o dumptype.d : dumptype.cc ../../include/PA5/copyright.h \ - ../../include/PA5/cool.h ../../include/PA5/copyright.h \ - ../../include/PA5/cool-io.h ../../include/PA5/tree.h \ - ../../include/PA5/stringtab.h ../../include/PA5/list.h cool-tree.h \ - cool-tree.handcode.h ../../include/PA5/stringtab.h \ - ../../include/PA5/utilities.h diff --git a/assignments/PA5/emit.h b/assignments/PA5/emit.h index a7c0c6b..32f85cb 100644 --- a/assignments/PA5/emit.h +++ b/assignments/PA5/emit.h @@ -31,7 +31,7 @@ #define METHOD_SEP "." #define CLASSINIT_SUFFIX "_init" #define PROTOBJ_SUFFIX "_protObj" -#define OBJECTPROTOBJ "Object"PROTOBJ_SUFFIX +#define OBJECTPROTOBJ "Object" PROTOBJ_SUFFIX #define INTCONST_PREFIX "int_const" #define STRCONST_PREFIX "str_const" #define BOOLCONST_PREFIX "bool_const" @@ -80,7 +80,7 @@ // #define JALR "\tjalr\t" #define JAL "\tjal\t" -#define RET "\tjr\t"RA"\t" +#define RET "\tjr\t" RA "\t" #define SW "\tsw\t" #define LW "\tlw\t" diff --git a/assignments/PA5/handle_flags.d b/assignments/PA5/handle_flags.d deleted file mode 100644 index b88c34d..0000000 --- a/assignments/PA5/handle_flags.d +++ /dev/null @@ -1,3 +0,0 @@ -handle_flags.o handle_flags.d : handle_flags.cc ../../include/PA5/copyright.h \ - ../../include/PA5/cool-io.h ../../include/PA5/copyright.h \ - ../../include/PA5/cgen_gc.h diff --git a/assignments/PA5/mycoolc b/assignments/PA5/mycoolc index 387adeb..bc836bc 100755 --- a/assignments/PA5/mycoolc +++ b/assignments/PA5/mycoolc @@ -1,2 +1,2 @@ -#!/bin/csh -f +#!/bin/bash ./lexer $* | ./parser $* | ./semant $* | ./cgen $* diff --git a/assignments/PA5/stdcoolc b/assignments/PA5/stdcoolc new file mode 100755 index 0000000..726379a --- /dev/null +++ b/assignments/PA5/stdcoolc @@ -0,0 +1,2 @@ +#!/bin/bash +../../bin/lexer $* | ../../bin/parser $* | ../../bin/semant $* | ../../bin/cgen $* diff --git a/assignments/PA5/stringtab.d b/assignments/PA5/stringtab.d deleted file mode 100644 index 5bd9701..0000000 --- a/assignments/PA5/stringtab.d +++ /dev/null @@ -1,4 +0,0 @@ -stringtab.o stringtab.d : stringtab.cc ../../include/PA5/copyright.h \ - ../../include/PA5/stringtab_functions.h ../../include/PA5/copyright.h \ - ../../include/PA5/cool-io.h ../../include/PA5/stringtab.h \ - ../../include/PA5/list.h ../../include/PA5/stringtab.h diff --git a/assignments/PA5/tree.d b/assignments/PA5/tree.d deleted file mode 100644 index d0878b4..0000000 --- a/assignments/PA5/tree.d +++ /dev/null @@ -1,3 +0,0 @@ -tree.o tree.d : tree.cc ../../include/PA5/copyright.h ../../include/PA5/tree.h \ - ../../include/PA5/copyright.h ../../include/PA5/stringtab.h \ - ../../include/PA5/list.h ../../include/PA5/cool-io.h diff --git a/assignments/PA5/utilities.d b/assignments/PA5/utilities.d deleted file mode 100644 index a9484ba..0000000 --- a/assignments/PA5/utilities.d +++ /dev/null @@ -1,6 +0,0 @@ -utilities.o utilities.d : utilities.cc ../../include/PA5/copyright.h \ - ../../include/PA5/cool-io.h ../../include/PA5/copyright.h \ - ../../include/PA5/cool-parse.h ../../include/PA5/cool-io.h \ - ../../include/PA5/tree.h ../../include/PA5/stringtab.h \ - ../../include/PA5/list.h ../../include/PA5/stringtab.h \ - ../../include/PA5/utilities.h