5 files changed, 12 insertions, 12 deletions

diff --git a/ljumptab.h b/ljumptab.h
index 8306f250..a24828bb 100644
--- a/ljumptab.h
+++ b/ljumptab.h
@@ -57,8 +57,8 @@ static const void *const disptab[NUM_OPCODES] = {
 &&L_OP_BANDK,
 &&L_OP_BORK,
 &&L_OP_BXORK,
-&&L_OP_SHRI,
 &&L_OP_SHLI,
+&&L_OP_SHRI,
 &&L_OP_ADD,
 &&L_OP_SUB,
 &&L_OP_MUL,
diff --git a/lopcodes.c b/lopcodes.c
index 092c3902..79ffbe25 100644
--- a/lopcodes.c
+++ b/lopcodes.c
@@ -53,8 +53,8 @@ LUAI_DDEF const lu_byte luaP_opmodes[NUM_OPCODES] = {
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_BANDK */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_BORK */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_BXORK */
- ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_SHRI */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_SHLI */
+ ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_SHRI */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_ADD */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_SUB */
  ,opmode(0, 0, 0, 0, 1, iABC)           /* OP_MUL */
diff --git a/lopcodes.h b/lopcodes.h
index 97870038..9ad21021 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -272,8 +272,8 @@ OP_BANDK,/*	A B C	R[A] := R[B] & K[C]:integer			*/
 OP_BORK,/*      A B C   R[A] := R[B] | K[C]:integer                     */
 OP_BXORK,/*     A B C   R[A] := R[B] ~ K[C]:integer                     */
 
-OP_SHRI,/*      A B sC  R[A] := R[B] >> sC                              */
 OP_SHLI,/*      A B sC  R[A] := sC << R[B]                              */
+OP_SHRI,/*      A B sC  R[A] := R[B] >> sC                              */
 
 OP_ADD,/*       A B C   R[A] := R[B] + R[C]                             */
 OP_SUB,/*       A B C   R[A] := R[B] - R[C]                             */
diff --git a/lopnames.h b/lopnames.h
index 965cec9b..39df332f 100644
--- a/lopnames.h
+++ b/lopnames.h
@@ -45,8 +45,8 @@ static const char *const opnames[] = {
   "BANDK",
   "BORK",
   "BXORK",
-  "SHRI",
   "SHLI",
+  "SHRI",
   "ADD",
   "SUB",
   "MUL",
diff --git a/lvm.c b/lvm.c
index bde850ea..8ad4344a 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1476,23 +1476,23 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
         op_bitwiseK(L, l_bxor);
         vmbreak;
       }
-      vmcase(OP_SHRI) {
+      vmcase(OP_SHLI) {
         StkId ra = RA(i);
         TValue *rb = vRB(i);
         int ic = GETARG_sC(i);
         lua_Integer ib;
         if (tointegerns(rb, &ib)) {
-          pc++; setivalue(s2v(ra), luaV_shiftl(ib, -ic));
+          pc++; setivalue(s2v(ra), luaV_shiftl(ic, ib));
         }
         vmbreak;
       }
-      vmcase(OP_SHLI) {
+      vmcase(OP_SHRI) {
         StkId ra = RA(i);
         TValue *rb = vRB(i);
         int ic = GETARG_sC(i);
         lua_Integer ib;
         if (tointegerns(rb, &ib)) {
-          pc++; setivalue(s2v(ra), luaV_shiftl(ic, ib));
+          pc++; setivalue(s2v(ra), luaV_shiftl(ib, -ic));
         }
         vmbreak;
       }
@@ -1538,14 +1538,14 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
         op_bitwise(L, l_bxor);
         vmbreak;
       }
-      vmcase(OP_SHR) {
-        op_bitwise(L, luaV_shiftr);
-        vmbreak;
-      }
       vmcase(OP_SHL) {
         op_bitwise(L, luaV_shiftl);
         vmbreak;
       }
+      vmcase(OP_SHR) {
+        op_bitwise(L, luaV_shiftr);
+        vmbreak;
+      }
       vmcase(OP_MMBIN) {
         StkId ra = RA(i);
         Instruction pi = *(pc - 2);  /* original arith. expression */