From e10c9c51e3bd5ca0cbfd75c25dbed5118fba67bf Mon Sep 17 00:00:00 2001 From: Brian Hackett Date: Wed, 18 May 2011 09:06:56 -0700 Subject: [PATCH] [INFER] x64 fixes, bug 656920. --- js/src/jsinfer.cpp | 2 +- js/src/methodjit/Logging.cpp | 5 ++--- js/src/methodjit/StubCalls.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp index 76d61075027..3726cf7186f 100644 --- a/js/src/jsinfer.cpp +++ b/js/src/jsinfer.cpp @@ -4191,7 +4191,7 @@ ScriptAnalysis::printTypes(JSContext *cx) if (js_CodeSpec[script->code[offset]].format & JOF_TYPESET) { TypeSet *types = script->bytecodeTypes(script->code + offset); - printf(" typeset %u:", types - script->typeArray); + printf(" typeset %d:", (int) (types - script->typeArray)); types->print(cx); printf("\n"); } diff --git a/js/src/methodjit/Logging.cpp b/js/src/methodjit/Logging.cpp index c0e010fd017..e3e5b24e2f2 100644 --- a/js/src/methodjit/Logging.cpp +++ b/js/src/methodjit/Logging.cpp @@ -90,8 +90,7 @@ js::JMCheckLogging() " regalloc Register allocation behavior\n" " inlin Call inlining behavior\n" " recompile Dynamic recompilations\n" - " full everything\n" - " notrace disable trace hints\n" + " full everything not affecting codegen\n" "\n" ); exit(0); @@ -126,7 +125,7 @@ js::JMCheckLogging() if (strstr(env, "inlin")) LoggingBits |= (1 << uint32(JSpew_Inlining)); if (strstr(env, "full")) - LoggingBits |= 0xFFFFFFFF; + LoggingBits |= 0xFFFFFFFF ^ (1 << JSpew_PCProf); } bool diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp index 43fb77769c8..d9382702717 100644 --- a/js/src/methodjit/StubCalls.cpp +++ b/js/src/methodjit/StubCalls.cpp @@ -2748,7 +2748,7 @@ stubs::TypeBarrierHelper(VMFrame &f, uint32 which) JS_ASSERT(which == 0 || which == 1); /* The actual pushed value is at sp[0], fix up the stack. See finishBarrier. */ - Value &result = f.regs.sp[-1 - which]; + Value &result = f.regs.sp[-1 - (int)which]; result = f.regs.sp[0]; /*