Housekeeping. Remove a few warnings during BUILT_OPT and spelling in comments.

This commit is contained in:
Andreas Gal 2008-07-08 22:40:07 -07:00
parent ca7768fbda
commit c3748164f4

View File

@ -311,9 +311,13 @@ public:
/* In debug mode vpname contains a textual description of the type of the /* In debug mode vpname contains a textual description of the type of the
slot during the forall iteration over al slots. */ slot during the forall iteration over al slots. */
#ifdef DEBUG #ifdef DEBUG
#define DEF_VPNAME char* vpname; unsigned vpnum
#define SET_VPNAME(name) do { vpname = name; vpnum = 0; } while(0) #define SET_VPNAME(name) do { vpname = name; vpnum = 0; } while(0)
#define INC_VPNUM() do { ++vpnum; } while(0) #define INC_VPNUM() do { ++vpnum; } while(0)
#else #else
#define DEF_VPNAME do {} while (0)
#define vpname ""
#define vpnum 0
#define SET_VPNAME(name) ((void)0) #define SET_VPNAME(name) ((void)0)
#define INC_VPNUM() ((void)0) #define INC_VPNUM() ((void)0)
#endif #endif
@ -324,7 +328,7 @@ public:
level frame which does not have args or vars. */ level frame which does not have args or vars. */
#define FORALL_SLOTS_IN_PENDING_FRAMES(entryFrame, currentFrame, code) \ #define FORALL_SLOTS_IN_PENDING_FRAMES(entryFrame, currentFrame, code) \
JS_BEGIN_MACRO \ JS_BEGIN_MACRO \
char* vpname = ""; unsigned vpnum = 0; \ DEF_VPNAME; \
/* find the global frame */ \ /* find the global frame */ \
JSStackFrame* global = entryFrame; \ JSStackFrame* global = entryFrame; \
while (global->down) \ while (global->down) \
@ -348,7 +352,7 @@ public:
for (;; fp = fp->down) { ++frames; if (fp == entryFrame) break; }; \ for (;; fp = fp->down) { ++frames; if (fp == entryFrame) break; }; \
/* stack them up since we want forward order (this should be fast */ \ /* stack them up since we want forward order (this should be fast */ \
/* now, since the previous loop prefetched everything for us and */ \ /* now, since the previous loop prefetched everything for us and */ \
/* the list tends to be short anyway (1-3 frames). */ \ /* the list tends to be short anyway [1-3 frames]). */ \
JSStackFrame* fstack[frames]; \ JSStackFrame* fstack[frames]; \
JSStackFrame** fspstop = &fstack[frames]; \ JSStackFrame** fspstop = &fstack[frames]; \
JSStackFrame** fsp = fspstop-1; \ JSStackFrame** fsp = fspstop-1; \
@ -1045,7 +1049,7 @@ js_LoopEdge(JSContext* cx)
return false; return false;
} }
/* execute previously recorded race */ /* execute previously recorded trace */
VMFragmentInfo* fi = (VMFragmentInfo*)f->vmprivate; VMFragmentInfo* fi = (VMFragmentInfo*)f->vmprivate;
double native[fi->maxNativeFrameSlots+1]; double native[fi->maxNativeFrameSlots+1];
#ifdef DEBUG #ifdef DEBUG