Merge TM -> JM

This commit is contained in:
Brian Hackett
2011-07-01 16:24:32 -07:00
3560 changed files with 75386 additions and 110433 deletions

View File

@@ -524,20 +524,17 @@ CallResultEscapes(jsbytecode *pc);
}
#endif
#ifdef DEBUG
#if defined(DEBUG) && defined(__cplusplus)
/*
* Disassemblers, for debugging only.
*/
#include <stdio.h>
#ifdef __cplusplus
extern JS_FRIEND_API(JSBool)
js_Disassemble(JSContext *cx, JSScript *script, JSBool lines, js::Sprinter *sp, int *counts = NULL);
js_Disassemble(JSContext *cx, JSScript *script, JSBool lines, js::Sprinter *sp);
extern JS_FRIEND_API(uintN)
js_Disassemble1(JSContext *cx, JSScript *script, jsbytecode *pc, uintN loc,
JSBool lines, js::Sprinter *sp, int *counts = NULL);
JSBool lines, js::Sprinter *sp);
#endif
#endif /* DEBUG */
/*
* Given bytecode address pc in script's main program code, return the operand