Merge branch 'pico8' into zepto8

Author: samhocevar

fix32.h

@@ -147,16 +147,15 @@ struct fix32
 
     inline fix32 operator <<(int y) const
     {
-        // XXX: not exactly the same as the pico8_shl()
-        return frombits(bits() << (y & 0x1f));
+        // If y is negative, use lshr() instead.
+        return y < 0 ? lshr(*this, -y) : frombits(y >= 32 ? 0 : bits() << y);
     }
 
     inline fix32 operator >>(int y) const
     {
-        // If y is negative, it is interpreted modulo 32. If y is >= 32,
-        // only the sign is preserved, so it's the same as for y == 31.
         using std::min;
-        return frombits(bits() >> (min(y, 31) & 0x1f));
+        // If y is negative, use << instead.
+        return y < 0 ? *this << -y : frombits(bits() >> min(y, 31));
     }
 
     inline fix32& operator +=(fix32 x) { return *this = *this + x; }
@@ -180,8 +179,8 @@ struct fix32
 
     static inline fix32 lshr(fix32 x, int y)
     {
-        // XXX: not exactly the same as the pico8_lshr()
-        return frombits(uint32_t(x.bits()) >> (y & 0x1f));
+        // If y is negative, use << instead.
+        return y < 0 ? x << -y : frombits(y >= 32 ? 0 : uint32_t(x.bits()) >> y);
     }
 
     static inline fix32 rotl(fix32 x, int y)

llex.c

@@ -40,7 +40,7 @@ static const char *const luaX_tokens [] = {
     "return", "then", "true", "until", "while",
     "..", "...", "==", ">=", "<=", "~=", "!=", "::",
     "<eof>", "<number>", "<name>", "<string>", "?",
-    "<eol>", "@@", "^^", "<<", ">>", ">>>", "<<>", ">><",
+    "<eol>", "^^", "<<", ">>", ">>>", "<<>", ">><",
     "+=", "-=", "*=", "/=", "%=", "^=", "\\=", "&=", "|=",
     "^^=", "<<=", ">>=", ">>>=", "<<>=", ">><=", "..=",
 };
@@ -530,11 +530,6 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         if (ls->current == '=') { next(ls); return TK_LSHRE; }
         else return TK_LSHR;
       }
-      case '@': {
-        next(ls);
-        if (ls->current != '@') return '@';
-        else { next(ls); return TK_DBAT; }
-      }
       case ':': {
         next(ls);
         if (ls->current != ':') return ':';

llex.h

@@ -27,7 +27,7 @@ enum RESERVED {
   TK_RETURN, TK_THEN, TK_TRUE, TK_UNTIL, TK_WHILE,
   /* other terminal symbols */
   TK_CONCAT, TK_DOTS, TK_EQ, TK_GE, TK_LE, TK_NE, TK_NE2, TK_DBCOLON,
-  TK_EOS, TK_NUMBER, TK_NAME, TK_STRING, TK_PRINT, TK_EOL, TK_DBAT,
+  TK_EOS, TK_NUMBER, TK_NAME, TK_STRING, TK_PRINT, TK_EOL,
   TK_BXOR, TK_SHL, TK_SHR, TK_LSHR, TK_ROTL, TK_ROTR,
   /* these must be last and match "ORDER OPR" */
   TK_ADDE, TK_SUBE, TK_MULE, TK_DIVE, TK_MODE, TK_POWE, TK_IDIVE,

lopcodes.h

@@ -204,7 +204,7 @@ OP_UNM,/*	A B	R(A) := -R(B)					*/
 OP_BNOT,/*	A B	R(A) := ~R(B)					*/
 OP_NOT,/*	A B	R(A) := not R(B)				*/
 OP_PEEK,/*	A B	R(A) := @ R(B)					*/
-OP_PEEK2,/*	A B	R(A) := @@ R(B)					*/
+OP_PEEK2,/*	A B	R(A) := % R(B)					*/
 OP_PEEK4,/*	A B	R(A) := $ R(B)					*/
 OP_LEN,/*	A B	R(A) := length of R(B)				*/
 

lparser.c

@@ -993,7 +993,7 @@ static UnOpr getunopr (int op) {
     case '-': return OPR_MINUS;
     case '~': return OPR_BNOT;
     case '@': return OPR_PEEK;
-    case TK_DBAT: return OPR_PEEK2;
+    case '%': return OPR_PEEK2;
     case '$': return OPR_PEEK4;
     case '#': return OPR_LEN;
     default: return OPR_NOUNOPR;
@@ -1040,10 +1040,10 @@ static const struct {
    {11, 11}, {11, 11}, {11, 11}, /* `*' `/' `%' */
    {13, 12},                     /* ^ (right associative) */
    {11, 11},                     /* `\' */
-   {8, 8}, {6, 6}, {7, 7},       /* `&' `|' `^^' */
-   {9, 9}, {9, 9}, {9, 9},       /* `<<' `>>' `>>>' */
-   {9, 9}, {9, 9},               /* `<<>' `>><' */
-   {5, 4},                       /* .. (right associative) */
+   {6, 6}, {4, 4}, {5, 5},       /* `&' `|' `^^' */
+   {7, 7}, {7, 7}, {7, 7},       /* `<<' `>>' `>>>' */
+   {7, 7}, {7, 7},               /* `<<>' `>><' */
+   {9, 8},                       /* .. (right associative) */
    {3, 3}, {3, 3}, {3, 3},       /* ==, <, <= */
    {3, 3}, {3, 3}, {3, 3},       /* ~=, >, >= */
    {2, 2}, {1, 1}                /* and, or */

lpico8lib.c

@@ -114,35 +114,27 @@ static int pico8_bnot(lua_State *l) {
 }
 
 static int pico8_shl(lua_State *l) {
-    // XXX: not exactly the same as fix32::operator<<
-    // If y is negative, it is interpreted modulo 32.
-    // If y is >= 32, result is always zero.
-    int32_t xbits = lua_tonumber(l, 1).bits();
-    int y = (int)lua_tonumber(l, 2);
-    lua_pushnumber(l, lua_Number::frombits(y >= 32 ? 0 : xbits << (y & 0x1f)));
+    lua_pushnumber(l, lua_tonumber(l, 1) << int(lua_tonumber(l, 2)));
     return 1;
 }
 
 static int pico8_lshr(lua_State *l) {
-    // XXX: not exactly the same as fix32::lshr
-    uint32_t xbits = uint32_t(lua_tonumber(l, 1).bits());
-    int y = int(lua_tonumber(l, 2));
-    lua_pushnumber(l, lua_Number::frombits(y >= 32 ? 0 : xbits >> (y & 0x1f)));
+    lua_pushnumber(l, lua_Number::lshr(lua_tonumber(l, 1), int(lua_tonumber(l, 2))));
     return 1;
 }
 
 static int pico8_shr(lua_State *l) {
-    lua_pushnumber(l, lua_tonumber(l, 1) >> (int)lua_tonumber(l, 2));
+    lua_pushnumber(l, lua_tonumber(l, 1) >> int(lua_tonumber(l, 2)));
     return 1;
 }
 
 static int pico8_rotl(lua_State *l) {
-    lua_pushnumber(l, lua_Number::rotl(lua_tonumber(l, 1), (int)lua_tonumber(l, 2)));
+    lua_pushnumber(l, lua_Number::rotl(lua_tonumber(l, 1), int(lua_tonumber(l, 2))));
     return 1;
 }
 
 static int pico8_rotr(lua_State *l) {
-    lua_pushnumber(l, lua_Number::rotr(lua_tonumber(l, 1), (int)lua_tonumber(l, 2)));
+    lua_pushnumber(l, lua_Number::rotr(lua_tonumber(l, 1), int(lua_tonumber(l, 2))));
     return 1;
 }
 

lua.c

@@ -484,9 +484,6 @@ int main (int argc, char **argv) {
     l_message(argv[0], "cannot create state: not enough memory");
     return EXIT_FAILURE;
   }
-unsigned char ram[65536];
-for (int i = 0; i < 65536; ++i) ram[i] = i %256;
-lua_setpico8memory(L, ram);
   /* call 'pmain' in protected mode */
   lua_pushcfunction(L, &pmain);
   lua_pushinteger(L, argc);  /* 1st argument */