Don't serialize IC opcodes

Translate IC opcodes to their non-IC variants before writing them out.
Before this commit they were not byte-swapped properly, breaking the
ability to load serialized bytecode containing ICs on systems with
different endianness.

Author: bnoordhuis

gen/function_source.c

@@ -5,7 +5,7 @@
 const uint32_t qjsc_function_source_size = 393;
 
 const uint8_t qjsc_function_source[393] = {
- 0x08, 0x06, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61,
+ 0x09, 0x06, 0x0c, 0x61, 0x63, 0x74, 0x75, 0x61,
  0x6c, 0x02, 0x66, 0x0c, 0x65, 0x78, 0x70, 0x65,
  0x63, 0x74, 0x14, 0x75, 0x73, 0x65, 0x20, 0x73,
  0x74, 0x72, 0x69, 0x63, 0x74, 0x34, 0x66, 0x75,

gen/hello.c

@@ -5,7 +5,7 @@
 const uint32_t qjsc_hello_size = 95;
 
 const uint8_t qjsc_hello[95] = {
- 0x08, 0x04, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
+ 0x09, 0x04, 0x0e, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
  0x6c, 0x65, 0x06, 0x6c, 0x6f, 0x67, 0x16, 0x48,
  0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72,
  0x6c, 0x64, 0x22, 0x65, 0x78, 0x61, 0x6d, 0x70,

gen/hello_module.c

@@ -5,7 +5,7 @@
 const uint32_t qjsc_fib_module_size = 318;
 
 const uint8_t qjsc_fib_module[318] = {
- 0x08, 0x03, 0x2c, 0x65, 0x78, 0x61, 0x6d, 0x70,
+ 0x09, 0x03, 0x2c, 0x65, 0x78, 0x61, 0x6d, 0x70,
  0x6c, 0x65, 0x73, 0x2f, 0x66, 0x69, 0x62, 0x5f,
  0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x6a,
  0x73, 0x06, 0x66, 0x69, 0x62, 0x02, 0x6e, 0x0d,
@@ -50,7 +50,7 @@ const uint8_t qjsc_fib_module[318] = {
 const uint32_t qjsc_hello_module_size = 183;
 
 const uint8_t qjsc_hello_module[183] = {
- 0x08, 0x07, 0x30, 0x65, 0x78, 0x61, 0x6d, 0x70,
+ 0x09, 0x07, 0x30, 0x65, 0x78, 0x61, 0x6d, 0x70,
  0x6c, 0x65, 0x73, 0x2f, 0x68, 0x65, 0x6c, 0x6c,
  0x6f, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65,
  0x2e, 0x6a, 0x73, 0x1e, 0x2e, 0x2f, 0x66, 0x69,

gen/repl.c

@@ -5,7 +5,7 @@
 const uint32_t qjsc_repl_size = 103010;
 
 const uint8_t qjsc_repl[103010] = {
- 0x08, 0x99, 0x03, 0x0e, 0x72, 0x65, 0x70, 0x6c,
+ 0x09, 0x99, 0x03, 0x0e, 0x72, 0x65, 0x70, 0x6c,
  0x2e, 0x6a, 0x73, 0x06, 0x73, 0x74, 0x64, 0x04,
  0x6f, 0x73, 0x02, 0x67, 0x10, 0x69, 0x73, 0x46,
  0x69, 0x6e, 0x69, 0x74, 0x65, 0x0c, 0x63, 0x6f,

gen/test_fib.c

@@ -5,7 +5,7 @@
 const uint32_t qjsc_test_fib_size = 172;
 
 const uint8_t qjsc_test_fib[172] = {
- 0x08, 0x07, 0x28, 0x65, 0x78, 0x61, 0x6d, 0x70,
+ 0x09, 0x07, 0x28, 0x65, 0x78, 0x61, 0x6d, 0x70,
  0x6c, 0x65, 0x73, 0x2f, 0x74, 0x65, 0x73, 0x74,
  0x5f, 0x66, 0x69, 0x62, 0x2e, 0x6a, 0x73, 0x10,
  0x2e, 0x2f, 0x66, 0x69, 0x62, 0x2e, 0x73, 0x6f,

quickjs-opcode.h

@@ -136,9 +136,12 @@ DEF(  put_ref_value, 1, 3, 0, none)
 DEF(     define_var, 6, 0, 0, atom_u8)
 DEF(check_define_var, 6, 0, 0, atom_u8)
 DEF(    define_func, 6, 1, 0, atom_u8)
+
+// order matters, see IC counterparts
 DEF(      get_field, 5, 1, 1, atom)
 DEF(     get_field2, 5, 1, 2, atom)
 DEF(      put_field, 5, 2, 0, atom)
+
 DEF( get_private_field, 1, 2, 1, none) /* obj prop -> value */
 DEF( put_private_field, 1, 3, 0, none) /* obj value prop -> */
 DEF(define_private_field, 1, 3, 1, none) /* obj prop value -> obj */
@@ -358,6 +361,7 @@ DEF(        is_null, 1, 1, 1, none)
 DEF(typeof_is_undefined, 1, 1, 1, none)
 DEF( typeof_is_function, 1, 1, 1, none)
 
+// order matters, see non-IC counterparts
 DEF(      get_field_ic, 5, 1, 1, none)
 DEF(     get_field2_ic, 5, 1, 2, none)
 DEF(      put_field_ic, 5, 2, 0, none)

quickjs.c

@@ -32518,7 +32518,7 @@ typedef enum BCTagEnum {
     BC_TAG_OBJECT_REFERENCE,
 } BCTagEnum;
 
-#define BC_VERSION 8
+#define BC_VERSION 9
 
 typedef struct BCWriterState {
     JSContext *ctx;
@@ -32722,18 +32722,24 @@ static void bc_byte_swap(uint8_t *bc_buf, int bc_len)
     }
 }
 
+static BOOL is_ic_op(uint8_t op)
+{
+    return op >= OP_get_field_ic && op <= OP_put_field_ic;
+}
+
 static int JS_WriteFunctionBytecode(BCWriterState *s,
-                                    const uint8_t *bc_buf1, int bc_len)
+                                    const JSFunctionBytecode *b)
 {
-    int pos, len, op;
+    int pos, len, bc_len, op;
     JSAtom atom;
     uint8_t *bc_buf;
     uint32_t val;
 
+    bc_len = b->byte_code_len;
     bc_buf = js_malloc(s->ctx, bc_len);
     if (!bc_buf)
         return -1;
-    memcpy(bc_buf, bc_buf1, bc_len);
+    memcpy(bc_buf, b->byte_code_buf, bc_len);
 
     pos = 0;
     while (pos < bc_len) {
@@ -32751,6 +32757,16 @@ static int JS_WriteFunctionBytecode(BCWriterState *s,
             put_u32(bc_buf + pos + 1, val);
             break;
         default:
+            // IC (inline cache) opcodes should not end up in the serialized
+            // bytecode; translate them to their non-IC counterparts here
+            if (is_ic_op(op)) {
+                val = get_u32(bc_buf + pos + 1);
+                atom = get_ic_atom(b->ic, val);
+                if (bc_atom_to_idx(s, &val, atom))
+                    goto fail;
+                put_u32(bc_buf + pos + 1, val);
+                bc_buf[pos] -= (OP_get_field_ic - OP_get_field);
+            }
             break;
         }
         pos += len;
@@ -32918,7 +32934,7 @@ static int JS_WriteFunctionTag(BCWriterState *s, JSValue obj)
         bc_put_u8(s, flags);
     }
 
-    if (JS_WriteFunctionBytecode(s, b->byte_code_buf, b->byte_code_len))
+    if (JS_WriteFunctionBytecode(s, b))
         goto fail;
 
     bc_put_atom(s, b->filename);
@@ -33643,6 +33659,7 @@ static int JS_ReadFunctionBytecode(BCReaderState *s, JSFunctionBytecode *b,
 #endif
             break;
         default:
+            assert(!is_ic_op(op)); // should not end up in serialized bytecode
             break;
         }
         pos += len;