1 files changed, 75 insertions, 0 deletions

diff --git a/src/vm_mips.dasc b/src/vm_mips.dasc
index 9a39edd69..40e15e888 100644
--- a/src/vm_mips.dasc
+++ b/src/vm_mips.dasc
@@ -982,6 +982,25 @@ static void build_subroutines(BuildCtx *ctx)
   |.  nop
 #endif
   |
+  |//-- Bit operator metamethods -------------------------------------------
+  |
+  |->vmeta_bnot:
+  |  move RC, RB
+  |
+  |->vmeta_bitop:
+  |  load_got lj_meta_bitop
+  |  decode_OP1 TMP0, INS
+  |   sw BASE, L->base
+  |  move CARG2, RA
+  |   sw PC, SAVE_PC
+  |  move CARG3, RB
+  |  move CARG4, RC
+  |  sw TMP0, ARG5
+  |  call_intern lj_meta_bitop  // (lua_State *L, TValue *ra,*rb,*rc, BCReg op)
+  |.  move CARG1, L
+  |  b ->cont_nop
+  |.  nop
+  |
   |//-- Call metamethod ----------------------------------------------------
   |
   |->vmeta_call:                        // Resolve and call __call metamethod.
@@ -3886,6 +3905,62 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
     |  ins_next2
     break;
 
+  /* -- Bit ops ----------------------------------------------------------- */
+
+  case BC_BNOT:
+    |  // RA = dst*8, RD = src*8
+    |  addu RB, BASE, RD
+    |  lw TMP0, HI(RB)
+    |   lw CRET1, LO(RB)
+    |  bne TMP0, TISNUM, ->vmeta_bnot
+    |.  addu RA, BASE, RA
+    |  not CRET1, CRET1
+    |  ins_next1
+    |  sw TISNUM, HI(RA)
+    |   sw CRET1, LO(RA)
+    |  ins_next2
+    break;
+
+    |.macro ins_bitop, ins
+    |  // RA = dst*8, RB = src1*8, RC = src2*8
+    |  decode_RB8a RB, INS
+    |  decode_RB8b RB
+    |   decode_RDtoRC8 RC, RD
+    |  addu RB, BASE, RB
+    |   addu RC, BASE, RC
+    |  lw TMP0, HI(RB)
+    |   lw TMP1, HI(RC)
+    |    lw CRET1, LO(RB)
+    |  bne TMP0, TISNUM, ->vmeta_bitop
+    |.  addu RA, BASE, RA
+    |    lw CRET2, LO(RC)
+    |   bne TMP1, TISNUM, ->vmeta_bitop
+    |.   ins CRET1, CRET1, CRET2
+    |  ins_next1
+    |  sw TISNUM, HI(RA)
+    |   sw CRET1, LO(RA)
+    |  ins_next2
+    |.endmacro
+
+  case BC_BAND:
+    |  ins_bitop and
+    break;
+  case BC_BOR:
+    |  ins_bitop or
+    break;
+  case BC_BXOR:
+    |  ins_bitop xor
+    break;
+  case BC_BSHL:
+    |  ins_bitop sllv
+    break;
+  case BC_BSHR:
+    |  ins_bitop srlv
+    break;
+  case BC_BSAR:
+    |  ins_bitop srav
+    break;
+
   /* -- Constant ops ------------------------------------------------------ */
 
   case BC_KSTR: