optimization levels

asm.l

@@ -83,11 +83,11 @@
 
 %%
 
-void asm_file(FILE * f) {
+void asm_file(FILE * f, int optlevel) {
     yyscan_t yyscanner;
 
     yylex_init(&yyscanner);
     yyset_in(f, yyscanner);
-    yyparse(yyscanner);
+    yyparse(optlevel, yyscanner);
     yylex_destroy(yyscanner);
 }

asm.y

@@ -3,6 +3,7 @@
 %define api.token.raw
 %define parse.error verbose
 %locations
+%parse-param { int optlevel }
 %param { yyscan_t scanner }
 
 %code top {
@@ -31,7 +32,7 @@
 
 %code {
     int yylex(YYSTYPE * yylvalp, YYLTYPE * yyllocp, yyscan_t scanner);
-    void yyerror(YYLTYPE * yyllocp, yyscan_t unused, const char * msg);
+    void yyerror(YYLTYPE * yyllocp, int unused_1, yyscan_t unused, const char * msg);
 }
 
 %token END 0 "end of file"
@@ -51,7 +52,7 @@
 %start Start
 %%
 Start
-: MaybeLF ToplevelScope { asm_gen(stdout, $2); }
+: MaybeLF ToplevelScope { asm_gen(stdout, $2, optlevel); }
 ;
 
 MaybeLF
@@ -145,8 +146,9 @@ NumericalConstant
 
 %%
 
-void yyerror(YYLTYPE * yyllocp, yyscan_t unused, const char * msg) {
+void yyerror(YYLTYPE * yyllocp, int unused_1, yyscan_t unused, const char * msg) {
     (void) unused;
+    (void) unused_1;
     fprintf(stderr, "wsi: %d:%d: %s\n", yyllocp->first_line, yyllocp->first_column, msg);
     exit(1);
 }

asm_common.h

@@ -22,7 +22,7 @@ struct node_t {
     uint32_t line, column;
 };
 
-void asm_gen(FILE *, vector(struct node_t));
-void asm_optimize(vector(struct node_t) * data);
+void asm_gen(FILE *, vector(struct node_t), int optlevel);
+void asm_optimize(vector(struct node_t) * data, int optlevel);
 
 #endif

asm_gen.c

@@ -113,7 +113,7 @@ void numeral(FILE * output, int32_t x) {
     N;
 }
 
-void asm_gen(FILE * output, vector(struct node_t) data) {
+void asm_gen(FILE * output, vector(struct node_t) data, int optlevel) {
     if(data) {
         int32_t x;
 
@@ -144,7 +144,7 @@ void asm_gen(FILE * output, vector(struct node_t) data) {
         finalize_labels(&s);
 
         // Pass 2: Optimizing the code.
-        asm_optimize(&data);
+        asm_optimize(&data, optlevel);
 
         // Pass 3: Generating code.
         vector_foreach(struct node_t, it, data) {

asm_optimize.c

@@ -6,13 +6,15 @@
 
 #define HAS(x) ((uintptr_t) (n - vector_begin(*data) - (x)) > vector_size(*data))
 
-void asm_optimize(vector(struct node_t) * data) {
+// optlevel = 1: optimize for size
+// optlevel = 2: optimize for speed
+void asm_optimize(vector(struct node_t) * data, int optlevel) {
     for(uint32_t idx = 0; idx < vector_size(*data); idx++) {
         struct node_t * n = (*data) + idx;
 
         switch(n->type) {
             case MUL:
-                if(n->data1.type == IMM_VALUE && n->data1.value == 2) {
+                if(n->data1.type == IMM_VALUE && n->data1.value == 2 && optlevel == 1) {
                     // MUL 2 => ADD / ADD     ~~ unconditionally saves 2 bytes.
                     n->data1.type = IMM_NONE;
                     n->data1.value = 0;

common.h

@@ -16,7 +16,7 @@ void disasm(FILE * output, vector(struct instruction_t) program);
 void disasm_single(FILE * output, struct instruction_t * it);
 int32_t run(struct parse_result_t program, struct state * state, void(*fatal)(char *));
 char * compile(struct parse_result_t program);
-void asm_file(FILE * f);
+void asm_file(FILE * f, int optlevel);
 
 #ifdef JIT
 

wsi.c

@@ -18,7 +18,7 @@ static void warn(char * message) {
 }
 
 int main(int argc, char * argv[]) {
-    int i, dis = 0, count = 0, aot = 0, jit = 0, masm = 0;
+    int i, dis = 0, count = 0, aot = 0, jit = 0, masm = 0, optimize = 0;
     for(i = 1; i < argc; i++) {
         char * arg = argv[i];
         if(*arg == '-') {
@@ -37,6 +37,8 @@ int main(int argc, char * argv[]) {
                     " -j/--jit: enable the JIT compiler.\n"
                     #endif
                     " -m/--masm: run the macro assembler.\n"
+                    " -Os: optimize for size.\n"
+                    " -Of: optimize to produce fast code.\n"
                     "default operation: run whitespace code.\n"
                 );
                 return 1;
@@ -46,6 +48,10 @@ int main(int argc, char * argv[]) {
                 count = 1;
             } else if(!strcmp(arg, "--masm") || arg[1] == 'm') {
                 masm = 1;
+            } else if(!strcmp(arg, "-Os")) {
+                optimize = 1;
+            } else if(!strcmp(arg, "-Of")) {
+                optimize = 2;
             } else if(!strcmp(arg, "--aot") || arg[1] == 'a') {
                 aot = 1;
 #ifdef JIT
@@ -86,7 +92,7 @@ int main(int argc, char * argv[]) {
             }
 
             if(masm) {
-                asm_file(input);
+                asm_file(input, optimize);
                 fclose(input);
                 return 0;
             }