wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[JAEGER] Fix mac build: inlineCallCount is a uintN, not uintptr_t.

Browse Source
This commit is contained in:
Sean Stangl 2010-07-20 23:41:46 -07:00
parent 7388a70f72
commit 5abdc6ec59
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jscntxt.h
View File

@ -195,7 +195,7 @@ struct TracerState
void* rpAtLastTreeCall; // value of rp at innermost tree call guard void* rpAtLastTreeCall; // value of rp at innermost tree call guard
VMSideExit* outermostTreeExitGuard; // the last side exit returned by js_CallTree VMSideExit* outermostTreeExitGuard; // the last side exit returned by js_CallTree
TreeFragment* outermostTree; // the outermost tree we initially invoked TreeFragment* outermostTree; // the outermost tree we initially invoked
uintptr_t* inlineCallCountp; // inline call count counter uintN* inlineCallCountp; // inline call count counter
VMSideExit** innermostNestedGuardp; VMSideExit** innermostNestedGuardp;
VMSideExit* innermost; VMSideExit* innermost;
uint64 startTime; uint64 startTime;
@ -1770,7 +1770,7 @@ struct JSContext
public: public:
friend class js::StackSpace; friend class js::StackSpace;
friend bool js::Interpret(JSContext *, JSStackFrame *, uintptr_t); friend bool js::Interpret(JSContext *, JSStackFrame *, uintN);
/* 'fp' and 'regs' must only be changed by calling these functions. */ /* 'fp' and 'regs' must only be changed by calling these functions. */
void setCurrentFrame(JSStackFrame *fp) { void setCurrentFrame(JSStackFrame *fp) {

2
js/src/jsinterp.cpp
View File

@ -2083,7 +2083,7 @@ IteratorNext(JSContext *cx, JSObject *iterobj, Value *rval)
namespace js { namespace js {
JS_REQUIRES_STACK bool JS_REQUIRES_STACK bool
Interpret(JSContext *cx, JSStackFrame *entryFrame, uintptr_t inlineCallCount) Interpret(JSContext *cx, JSStackFrame *entryFrame, uintN inlineCallCount)
{ {
#ifdef MOZ_TRACEVIS #ifdef MOZ_TRACEVIS
TraceVisStateObj tvso(cx, S_INTERP); TraceVisStateObj tvso(cx, S_INTERP);

2
js/src/jsinterp.h
View File

@ -370,7 +370,7 @@ extern JS_REQUIRES_STACK bool
InvokeConstructor(JSContext *cx, const InvokeArgsGuard &args); InvokeConstructor(JSContext *cx, const InvokeArgsGuard &args);
extern JS_REQUIRES_STACK bool extern JS_REQUIRES_STACK bool
Interpret(JSContext *cx, JSStackFrame *stopFp, uintptr_t inlineCallCount = 0); Interpret(JSContext *cx, JSStackFrame *stopFp, uintN inlineCallCount = 0);
extern JS_REQUIRES_STACK bool extern JS_REQUIRES_STACK bool
RunScript(JSContext *cx, JSScript *script, JSFunction *fun, JSObject *scopeChain); RunScript(JSContext *cx, JSScript *script, JSFunction *fun, JSObject *scopeChain);

12
js/src/jstracer.cpp
View File

@ -6053,7 +6053,7 @@ AttemptToExtendTree(JSContext* cx, VMSideExit* anchor, VMSideExit* exitedFrom, j
} }
static JS_REQUIRES_STACK bool static JS_REQUIRES_STACK bool
ExecuteTree(JSContext* cx, TreeFragment* f, uintptr_t& inlineCallCount, ExecuteTree(JSContext* cx, TreeFragment* f, uintN& inlineCallCount,
VMSideExit** innermostNestedGuardp, VMSideExit** lrp); VMSideExit** innermostNestedGuardp, VMSideExit** lrp);
static inline MonitorResult static inline MonitorResult
@ -6067,7 +6067,7 @@ RecordingIfTrue(bool b)
* MONITOR_RECORDING, the recording has been aborted. * MONITOR_RECORDING, the recording has been aborted.
*/ */
JS_REQUIRES_STACK MonitorResult JS_REQUIRES_STACK MonitorResult
TraceRecorder::recordLoopEdge(JSContext* cx, TraceRecorder* r, uintptr_t& inlineCallCount) TraceRecorder::recordLoopEdge(JSContext* cx, TraceRecorder* r, uintN& inlineCallCount)
{ {
#ifdef JS_THREADSAFE #ifdef JS_THREADSAFE
if (cx->fp->scopeChain->getGlobal()->scope()->title.ownercx != cx) { if (cx->fp->scopeChain->getGlobal()->scope()->title.ownercx != cx) {
@ -6134,7 +6134,7 @@ TraceRecorder::recordLoopEdge(JSContext* cx, TraceRecorder* r, uintptr_t& inline
} }
JS_REQUIRES_STACK AbortableRecordingStatus JS_REQUIRES_STACK AbortableRecordingStatus
TraceRecorder::attemptTreeCall(TreeFragment* f, uintptr_t& inlineCallCount) TraceRecorder::attemptTreeCall(TreeFragment* f, uintN& inlineCallCount)
{ {
/* /*
* It is absolutely forbidden to have recursive loops tree call themselves * It is absolutely forbidden to have recursive loops tree call themselves
@ -6159,7 +6159,7 @@ TraceRecorder::attemptTreeCall(TreeFragment* f, uintptr_t& inlineCallCount)
prepareTreeCall(f); prepareTreeCall(f);
#ifdef DEBUG #ifdef DEBUG
uintptr_t oldInlineCallCount = inlineCallCount; uintN oldInlineCallCount = inlineCallCount;
#endif #endif
JSContext *localCx = cx; JSContext *localCx = cx;
@ -6521,7 +6521,7 @@ FindVMCompatiblePeer(JSContext* cx, JSObject* globalObj, TreeFragment* f, uintN&
*/ */
JS_ALWAYS_INLINE JS_ALWAYS_INLINE
TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f, TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
uintptr_t& inlineCallCount, VMSideExit** innermostNestedGuardp) uintN& inlineCallCount, VMSideExit** innermostNestedGuardp)
: cx(cx), : cx(cx),
stackBase(tm->storage->stack()), stackBase(tm->storage->stack()),
sp(stackBase + f->nativeStackBase / sizeof(double)), sp(stackBase + f->nativeStackBase / sizeof(double)),
@ -16119,7 +16119,7 @@ class AutoRetBlacklist
}; };
JS_REQUIRES_STACK TracePointAction JS_REQUIRES_STACK TracePointAction
MonitorTracePoint(JSContext* cx, uintptr_t& inlineCallCount, bool& blacklist) MonitorTracePoint(JSContext* cx, uintN& inlineCallCount, bool& blacklist)
{ {
JSStackFrame* fp = cx->fp; JSStackFrame* fp = cx->fp;
TraceMonitor* tm = &JS_TRACE_MONITOR(cx); TraceMonitor* tm = &JS_TRACE_MONITOR(cx);

12
js/src/jstracer.h
View File

@ -1416,10 +1416,10 @@ class TraceRecorder
JS_REQUIRES_STACK VMSideExit* downSnapshot(FrameInfo* downFrame); JS_REQUIRES_STACK VMSideExit* downSnapshot(FrameInfo* downFrame);
JS_REQUIRES_STACK TreeFragment* findNestedCompatiblePeer(TreeFragment* f); JS_REQUIRES_STACK TreeFragment* findNestedCompatiblePeer(TreeFragment* f);
JS_REQUIRES_STACK AbortableRecordingStatus attemptTreeCall(TreeFragment* inner, JS_REQUIRES_STACK AbortableRecordingStatus attemptTreeCall(TreeFragment* inner,
uintptr_t& inlineCallCount); uintN& inlineCallCount);
static JS_REQUIRES_STACK MonitorResult recordLoopEdge(JSContext* cx, TraceRecorder* r, static JS_REQUIRES_STACK MonitorResult recordLoopEdge(JSContext* cx, TraceRecorder* r,
uintptr_t& inlineCallCount); uintN& inlineCallCount);
/* Allocators associated with this recording session. */ /* Allocators associated with this recording session. */
VMAllocator& tempAlloc() const { return *traceMonitor->tempAlloc; } VMAllocator& tempAlloc() const { return *traceMonitor->tempAlloc; }
@ -1459,7 +1459,7 @@ class TraceRecorder
friend class RecursiveSlotMap; friend class RecursiveSlotMap;
friend class UpRecursiveSlotMap; friend class UpRecursiveSlotMap;
friend MonitorResult MonitorLoopEdge(JSContext*, uintN&, RecordReason); friend MonitorResult MonitorLoopEdge(JSContext*, uintN&, RecordReason);
friend TracePointAction MonitorTracePoint(JSContext*, uintptr_t &, friend TracePointAction MonitorTracePoint(JSContext*, uintN &inlineCallCount,
bool &blacklist); bool &blacklist);
friend void AbortRecording(JSContext*, const char*); friend void AbortRecording(JSContext*, const char*);
@ -1479,7 +1479,7 @@ public:
/* Entry points / callbacks from the interpreter. */ /* Entry points / callbacks from the interpreter. */
JS_REQUIRES_STACK AbortableRecordingStatus monitorRecording(JSOp op); JS_REQUIRES_STACK AbortableRecordingStatus monitorRecording(JSOp op);
JS_REQUIRES_STACK AbortableRecordingStatus record_EnterFrame(uintptr_t& inlineCallCount); JS_REQUIRES_STACK AbortableRecordingStatus record_EnterFrame(uintN& inlineCallCount);
JS_REQUIRES_STACK AbortableRecordingStatus record_LeaveFrame(); JS_REQUIRES_STACK AbortableRecordingStatus record_LeaveFrame();
JS_REQUIRES_STACK AbortableRecordingStatus record_SetPropHit(PropertyCacheEntry* entry, JS_REQUIRES_STACK AbortableRecordingStatus record_SetPropHit(PropertyCacheEntry* entry,
JSScopeProperty* sprop); JSScopeProperty* sprop);
@ -1541,10 +1541,10 @@ public:
#define TRACE_2(x,a,b) TRACE_ARGS(x, (a, b)) #define TRACE_2(x,a,b) TRACE_ARGS(x, (a, b))
extern JS_REQUIRES_STACK MonitorResult extern JS_REQUIRES_STACK MonitorResult
MonitorLoopEdge(JSContext* cx, uintptr_t& inlineCallCount, RecordReason reason); MonitorLoopEdge(JSContext* cx, uintN& inlineCallCount, RecordReason reason);
extern JS_REQUIRES_STACK TracePointAction extern JS_REQUIRES_STACK TracePointAction
MonitorTracePoint(JSContext*, uintptr_t &, bool& blacklist); MonitorTracePoint(JSContext*, uintN& inlineCallCount, bool& blacklist);
extern JS_REQUIRES_STACK void extern JS_REQUIRES_STACK void
AbortRecording(JSContext* cx, const char* reason); AbortRecording(JSContext* cx, const char* reason);

2
js/src/methodjit/InvokeHelpers.cpp
View File

@ -776,7 +776,7 @@ RunTracer(VMFrame &f)
entryFrame->down->script->isValidJitCode(f.scriptedReturn)); entryFrame->down->script->isValidJitCode(f.scriptedReturn));
bool blacklist; bool blacklist;
uintptr_t inlineCallCount = f.inlineCallCount; uintN inlineCallCount = f.inlineCallCount;
tpa = MonitorTracePoint(f.cx, inlineCallCount, blacklist); tpa = MonitorTracePoint(f.cx, inlineCallCount, blacklist);
JS_ASSERT(!TRACE_RECORDER(cx)); JS_ASSERT(!TRACE_RECORDER(cx));