From d08877c48267bfe3658dbff4a8d0a8f9f5514bff Mon Sep 17 00:00:00 2001 From: Luke Wagner Date: Thu, 16 Jan 2014 10:23:19 -0600 Subject: [PATCH] Bug 916612 - rm some unused JOF_* bits (r=wingo) --HG-- extra : rebase_source : 6155e21575185241e792757abb13efceb3da4396 --- js/src/jsopcode.cpp | 17 ----------------- js/src/jsopcode.h | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp index 482b70aa1e3..264d64e0b94 100644 --- a/js/src/jsopcode.cpp +++ b/js/src/jsopcode.cpp @@ -1025,26 +1025,9 @@ js_Disassemble1(JSContext *cx, HandleScript script, jsbytecode *pc, Sprint(sp, " %u", GET_SLOTNO(pc)); break; - case JOF_SLOTOBJECT: { - Sprint(sp, " %u", GET_SLOTNO(pc)); - JSObject *obj = script->getObject(GET_UINT32_INDEX(pc + SLOTNO_LEN)); - JSAutoByteString bytes; - RootedValue v(cx, ObjectValue(*obj)); - if (!ToDisassemblySource(cx, v, &bytes)) - return 0; - Sprint(sp, " %s", bytes.ptr()); - break; - } - { int i; - case JOF_UINT16PAIR: - i = (int)GET_UINT16(pc); - Sprint(sp, " %d", i); - pc += UINT16_LEN; - /* FALL THROUGH */ - case JOF_UINT16: i = (int)GET_UINT16(pc); goto print_int; diff --git a/js/src/jsopcode.h b/js/src/jsopcode.h index ed75130495f..03e733ea3dc 100644 --- a/js/src/jsopcode.h +++ b/js/src/jsopcode.h @@ -55,11 +55,11 @@ typedef enum JSOp { atom index */ #define JOF_INT32 14 /* int32_t immediate operand */ #define JOF_OBJECT 15 /* unsigned 16-bit object index */ -#define JOF_SLOTOBJECT 16 /* uint16_t slot index + object index */ +/* 16 is unused */ #define JOF_REGEXP 17 /* unsigned 32-bit regexp index */ #define JOF_INT8 18 /* int8_t immediate operand */ #define JOF_ATOMOBJECT 19 /* uint16_t constant index + object index */ -#define JOF_UINT16PAIR 20 /* pair of uint16_t immediates */ +/* 20 is unused */ #define JOF_SCOPECOORD 21 /* pair of uint16_t immediates followed by block index */ #define JOF_TYPEMASK 0x001f /* mask for above immediate types */