X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=interpreters%2Fgit%2Fopcodes.c;h=cc0b188acb08d278e11efc802a2258d5e86e174a;hb=75009f8f40bbb580194e1722db76f4644bf18641;hp=a57abb3a8a8c82057383bd47669ab98814d4bf10;hpb=89081782541e85e079f64839ffb26b4e74273eb7;p=projects%2Fchimara%2Fchimara.git

diff --git a/interpreters/git/opcodes.c b/interpreters/git/opcodes.c
index a57abb3..cc0b188 100644
--- a/interpreters/git/opcodes.c
+++ b/interpreters/git/opcodes.c
@@ -45,6 +45,17 @@ static void parseLLS (git_uint32* pc, Label op)
     emitCode (op);
     parseStore (pc, reg_S1, modes [2], size32);
 }
+static void parseLLSS (git_uint32* pc, Label op)
+{
+    int modes [4];
+    parseModeNibbles (pc, 4, modes);
+
+    parseLoad (pc, reg_L1, modes [0], size32, NULL);
+    parseLoad (pc, reg_L2, modes [1], size32, NULL);
+    emitCode (op);
+    parseStore (pc, reg_S1, modes [2], size32);
+    parseStore (pc, reg_S2, modes [3], size32);
+}
 static void parseL (git_uint32* pc, Label op)
 {
     int modes [1];
@@ -94,6 +105,16 @@ static void parse_finish_branch (git_uint32* pc, Label op, LoadReg reg, int mode
         emitData(*pc);
     }
 }
+static void parseLLLL_branch (git_uint32* pc, Label op)
+{
+    int modes [4];
+    parseModeNibbles (pc, 4, modes);
+
+    parseLoad (pc, reg_L1, modes [0], size32, NULL);
+    parseLoad (pc, reg_L2, modes [1], size32, NULL);
+    parseLoad (pc, reg_L3, modes [2], size32, NULL);
+    parse_finish_branch (pc, op, reg_L4, modes [3]);
+}
 static void parseLLL_branch (git_uint32* pc, Label op)
 {
     int modes [3];
@@ -147,27 +168,10 @@ static void parseSS (git_uint32* pc, Label op)
 }
 static void parseCatch (git_uint32 * pc)
 {
-    Block stubCode;
     int modes [2];
     parseModeNibbles (pc, 2, modes);
 
-    parseCatchStub (pc, modes[0]);
-
-    // This is a little nasty. The last thing emitted by
-    // parseCatchStub() is the current value of the PC,
-    // which is where execution will resume when and if
-    // the stub is used; but execution should resume
-    // after the branch we're about to do, so we'll need
-    // to fix up that emitted value.
-
-    stubCode = peekAtEmittedStuff (1);
-
-    parseLoad (pc, reg_L1, modes[1], size32, NULL);
-    emitCode (label_jump_var);
-    emitData(*pc);
-
-    // Fix up the end of the stub, as described above.
-    *stubCode = *pc;
+    parseCatchStub (pc, modes);
 }
 void parseInstruction (git_uint32* pc, int * done)
 {
@@ -359,7 +363,7 @@ void parseInstruction (git_uint32* pc, int * done)
         // Continuations
 
         case op_catch: parseCatch (pc); break;
-	    case op_throw:
+        case op_throw:
             parseLL (pc, label_throw);
             *done = 1;
             break;
@@ -452,7 +456,45 @@ void parseInstruction (git_uint32* pc, int * done)
             
         case op_accelfunc: parseLL (pc, label_accelfunc); break;
         case op_accelparam: parseLL (pc, label_accelparam); break;
-       
+
+        // Floating point
+
+        case op_numtof: parseLS (pc, label_numtof); break;
+        case op_ftonumz: parseLS (pc, label_ftonumz); break;
+        case op_ftonumn: parseLS (pc, label_ftonumn); break;
+        case op_ceil: parseLS (pc, label_ceil); break;
+        case op_floor: parseLS (pc, label_floor); break;
+        case op_sqrt: parseLS (pc, label_sqrt); break;
+        case op_exp: parseLS (pc, label_exp); break;
+        case op_log: parseLS (pc, label_log); break;
+
+        case op_fadd: parseLLS (pc, label_fadd_discard); break;
+        case op_fsub: parseLLS (pc, label_fsub_discard); break;
+        case op_fmul: parseLLS (pc, label_fmul_discard); break;
+        case op_fdiv: parseLLS (pc, label_fdiv_discard); break;
+        case op_pow: parseLLS (pc, label_pow); break;
+        case op_atan2: parseLLS (pc, label_atan2); break;
+
+        case op_fmod: parseLLSS (pc, label_fmod); break;
+
+        case op_sin: parseLS (pc, label_sin); break;
+        case op_cos: parseLS (pc, label_cos); break;
+        case op_tan: parseLS (pc, label_tan); break;
+        case op_asin: parseLS (pc, label_asin); break;
+        case op_acos: parseLS (pc, label_acos); break;
+        case op_atan: parseLS (pc, label_atan); break;
+
+        case op_jfeq: parseLLLL_branch (pc, label_jfeq_var); break;
+        case op_jfne: parseLLLL_branch (pc, label_jfne_var); break;
+
+        case op_jflt: parseLLL_branch (pc, label_jflt_var); break;
+        case op_jfle: parseLLL_branch (pc, label_jfle_var); break;
+        case op_jfgt: parseLLL_branch (pc, label_jfgt_var); break;
+        case op_jfge: parseLLL_branch (pc, label_jfge_var); break;
+
+        case op_jisnan: parseLL_branch (pc, label_jisnan_var); break;
+        case op_jisinf: parseLL_branch (pc, label_jisinf_var); break;
+
         // Special Git opcodes
         
         case op_git_setcacheram: parseL (pc, label_git_setcacheram); break;