Merge pull request #59 from Priw8/master

Some new features and bug fixes in thecl
thpatch · Aug 27, 2019 · 5e0318c · 5e0318c
2 parents 24826bf + 06758a0
commit 5e0318c
Show file tree

Hide file tree

Showing 8 changed files with 452 additions and 58 deletions.
diff --git a/thecl/ecsparse.y b/thecl/ecsparse.y
diff --git a/thecl/ecsscan.l b/thecl/ecsscan.l
@@ -84,6 +84,7 @@
 "else"     return ELSE;
 "do"       return DO;
 "while"    return WHILE;
+"times"    return TIMES;
 "switch"   return SWITCH;
 "case"     return CASE;
 "break"    return BREAK;
@@ -126,6 +127,10 @@ _fS return CAST_FI;
     yylval.floating = strtof(yytext, NULL);
     return FLOATING;
 }
+rad\(-?[0-9]+(\.[0-9]*)?f\) {
+    yylval.floating = strtof(yytext+4, NULL) / 180.0f * 3.14159265359f;
+    return FLOATING;
+}
 ins_[0-9]+ {
     yylval.integer = strtol(yytext + 4, NULL, 10);
     return INSTRUCTION;
@@ -138,6 +143,12 @@ ins_[0-9]+ {
     yylval.integer = strtol(yytext, NULL, 16);
     return INTEGER;
 }
+-?0b[0-1]+ {
+    bool isNegative = yytext[0] == '-';
+    yylval.integer = strtol(yytext + (isNegative ? 3 : 2), NULL, 2);
+    if (isNegative) yylval.integer = -yylval.integer;
+    return INTEGER;
+}
 ![-*ENHLWXYZO4567]+ {
     yylval.string = strdup(yytext + 1);
     return RANK;

diff --git a/thecl/expr.c b/thecl/expr.c
@@ -115,19 +115,7 @@ th10_expressions[] = {
 static const expr_t*
 expr_get_table(unsigned int version)
 {
-    if (   version == 10
-        || version == 103
-        || version == 11
-        || version == 12
-        || version == 125
-        || version == 128
-        || version == 13
-        || version == 14
-        || version == 143
-        || version == 15
-        || version == 16
-        || version == 165
-        || version == 17)
+    if (not_pre_th10(version))
         return th10_expressions;
     return th10_no_expressions;
 }

diff --git a/thecl/thecl.c b/thecl/thecl.c
@@ -42,6 +42,7 @@ extern const thecl_module_t th10_ecl;
 eclmap_t* g_eclmap_opcode = NULL;
 eclmap_t* g_eclmap_global = NULL;
 bool g_ecl_rawoutput = false;
+bool g_ecl_simplecreate = false;
 bool g_was_error = false;
 
 thecl_t*
@@ -173,6 +174,25 @@ free_eclmaps(void)
     eclmap_free(g_eclmap_global);
 }
 
+int
+not_pre_th10(
+    unsigned int version)
+{
+    return version == 10
+        || version == 103
+        || version == 11
+        || version == 12
+        || version == 125
+        || version == 128
+        || version == 13
+        || version == 14
+        || version == 143
+        || version == 15
+        || version == 16
+        || version == 165
+        || version == 17;
+}
+
 static void
 print_usage(void)
 {
@@ -183,6 +203,7 @@ print_usage(void)
            "  -V  display version information and exit\n"
            "  -m  use map file for translating mnemonics\n"
            "  -r  output raw ECL opcodes, applying minimal transformations\n"
+           "  -s  use simple creation, which doesn't add any instructions automatically\n"
            "VERSION can be:\n"
            "  6, 7, 8, 9, 95, 10, 103 (for Uwabami Breakers), 11, 12, 125, 128, 13, 14, 143, 15, 16, 165 or 17\n"
            "Report bugs to <" PACKAGE_BUGREPORT ">.\n", argv0);
@@ -208,7 +229,7 @@ main(int argc, char* argv[])
     int opt;
     int ind=0;
     while(argv[util_optind]) {
-        switch(opt = util_getopt(argc, argv, ":c:d:Vm:r")) {
+        switch(opt = util_getopt(argc, argv, ":c:d:Vm:r:s")) {
         case 'c':
         case 'd':
             if(mode != -1) {
@@ -234,6 +255,9 @@ main(int argc, char* argv[])
         case 'r':
             g_ecl_rawoutput = true;
             break;
+        case 's':
+            g_ecl_simplecreate = true;
+            break;
         default:
             util_getopt_default(&ind,argv,opt,print_usage);
         }
@@ -284,6 +308,12 @@ main(int argc, char* argv[])
                 exit(1);
             }
         }
+        if (g_ecl_simplecreate) {
+            if (mode != 'c') {
+                fprintf(stderr, "%s: 's' option cannot be used while dumping\n", argv0);
+                exit(1);
+            }
+        }
 
         if (0 < argc) {
             current_input = argv[0];

diff --git a/thecl/thecl.h b/thecl/thecl.h
@@ -57,6 +57,13 @@ typedef enum {
 #define RANK_ID_6      (1 << 6)
 #define RANK_ID_7      (1 << 7)
 
+// Numbers of important ECL instructions
+#define TH10_INS_RET_BIG        1
+#define TH10_INS_RET_NORMAL     10
+#define TH10_INS_CALL           11
+#define TH10_INS_CALL_ASYNC     15
+#define TH10_INS_STACK_ALLOC    40
+
 typedef struct thecl_param_t {
     int type;
     value_t value;
@@ -69,6 +76,9 @@ thecl_param_t* param_new(
 void param_free(
     thecl_param_t* param);
 
+int not_pre_th10(
+    unsigned int version);
+
 typedef struct thecl_instr_t {
     thecl_instr_type type;
     char* string;
@@ -188,6 +198,7 @@ extern int yyparse(parser_state_t*);
 extern eclmap_t* g_eclmap_opcode;
 extern eclmap_t* g_eclmap_global;
 extern bool g_ecl_rawoutput;
+extern bool g_ecl_simplecreate;
 extern bool g_was_error;
 
 #endif
diff --git a/thecl/thecl06.c b/thecl/thecl06.c
@@ -865,10 +865,10 @@ th06_dump(
                         (instr->rank) & RANK_NORMAL  ? "N" : "",
                         (instr->rank) & RANK_HARD    ? "H" : "",
                         (instr->rank) & RANK_LUNATIC ? "L" : "",
-                        !((instr->rank) & RANK_ID_4) ? "W" : "",
-                        !((instr->rank) & RANK_ID_5) ? "X" : "",
-                        !((instr->rank) & RANK_ID_6) ? "Y" : "",
-                        !((instr->rank) & RANK_ID_7) ? "Z" : "");
+                        !((instr->rank) & RANK_ID_4) ? "4" : "",
+                        !((instr->rank) & RANK_ID_5) ? "5" : "",
+                        !((instr->rank) & RANK_ID_6) ? "6" : "",
+                        !((instr->rank) & RANK_ID_7) ? "7" : "");
                 }
                 break;
             case THECL_INSTR_INSTR: {

diff --git a/util/list.c b/util/list.c
@@ -69,6 +69,16 @@ list_head(
         return NULL;
 }
 
+void*
+list_tail(
+    list_t* list)
+{
+    if (list->tail)
+        return list->tail->data;
+    else
+        return NULL;
+}
+
 int
 list_empty(
     list_t* list)

diff --git a/util/list.h b/util/list.h
@@ -51,6 +51,8 @@ list_t* list_new(void);
 list_node_t* list_node_new(void);
 /* Returns the data of head in the list. */
 void* list_head(list_t* list);
+/* Returns the data of tail in the list. */
+void* list_tail(list_t* list);
 /* Returns 1 if the list is empty. */
 int list_empty(list_t* list);
 /* Sets a node as the tail of the list. */