Fix x86 Win32 port by disabling LUA_MSASMTRICK and adding explicit casts.

samhocevar · samhocevar · commit 4da310b84224 · 2019-09-05T18:00:33.000+02:00
diff --git a/ltable.c b/ltable.c
@@ -451,7 +451,7 @@ const TValue *luaH_getint (Table *t, int key) {
     lua_Number nk = cast_num(key);
     Node *n = hashnum(t, nk);
     do {  /* check whether `key' is somewhere in the chain */
-      if (ttisnumber(gkey(n)) && luai_numeq(nvalue(gkey(n)), nk))
+      if (ttisnumber(gkey(n)) && luai_numeq((lua_Number)nvalue(gkey(n)), nk))
         return gval(n);  /* that's it */
       else n = gnext(n);
     } while (n);
diff --git a/luaconf.h b/luaconf.h
@@ -555,6 +555,7 @@
 #undef LUA_NUMBER_DOUBLE
 #undef LUA_NUMBER
 #undef LUA_IEEE754TRICK
+#undef LUA_MSASMTRICK
 #undef LUAI_UACNUMBER
 
 #undef lua_number2str
diff --git a/lvm.c b/lvm.c
@@ -766,7 +766,7 @@ void luaV_execute (lua_State *L) {
       )
       vmcase(OP_FORLOOP,
         lua_Number step = nvalue(ra+2);
-        lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */
+        lua_Number idx = luai_numadd(L, (lua_Number)nvalue(ra), step); /* increment index */
         lua_Number limit = nvalue(ra+1);
         if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)
                                    : luai_numle(L, limit, idx)) {

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,7 @@ void luaV_execute (lua_State *L) {`
`766`	`766`	`)`
`767`	`767`	`vmcase(OP_FORLOOP,`
`768`	`768`	`lua_Number step = nvalue(ra+2);`
`769`		`- lua_Number idx = luai_numadd(L, nvalue(ra), step); /* increment index */`
	`769`	`+ lua_Number idx = luai_numadd(L, (lua_Number)nvalue(ra), step); /* increment index */`
`770`	`770`	`lua_Number limit = nvalue(ra+1);`
`771`	`771`	`if (luai_numlt(L, 0, step) ? luai_numle(L, idx, limit)`
`772`	`772`	`: luai_numle(L, limit, idx)) {`