Bug 523505 - Followup build fixes, r=gal on IRC.
authorGraydon Hoare <graydon@mozilla.com>
Wed, 21 Oct 2009 19:58:21 -0700
changeset 34323 c79c8a8080c6f0e0f7f9736fb094647a99ab8587
parent 34322 a8810e7752da2852a8a4f57f11db511a38c62c96
child 34325 bd1b27a9da16c89ad1ee71a66fb59ceda279207a
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgal
bugs523505
milestone1.9.3a1pre
Bug 523505 - Followup build fixes, r=gal on IRC.
js/src/nanojit/CodeAlloc.cpp
js/src/nanojit/NativeX64.h
--- a/js/src/nanojit/CodeAlloc.cpp
+++ b/js/src/nanojit/CodeAlloc.cpp
@@ -305,22 +305,22 @@ extern  "C" void sync_instruction_memory
     // fixme: sync_instruction_memory is a solaris api, test for solaris not sparc
     void CodeAlloc::flushICache(void *start, size_t len) {
             sync_instruction_memory((char*)start, len);
     }
 
 #elif defined AVMPLUS_UNIX
     #ifdef ANDROID
     void CodeAlloc::flushICache(void *start, size_t len) {
-        cacheflush((int)start, (int)(start + len), 0);
+        cacheflush((int)start, (int)start + len, 0);
     }
 	#else
     // fixme: __clear_cache is a libgcc feature, test for libgcc or gcc
     void CodeAlloc::flushICache(void *start, size_t len) {
-        __clear_cache((char*)start, (char*)(start + len));
+        __clear_cache((char*)start, (char*)start + len);
     }
 	#endif
 #endif // AVMPLUS_MAC && NANOJIT_PPC
 
     void CodeAlloc::addBlock(CodeList* &blocks, CodeList* b) {
         b->next = blocks;
         blocks = b;
     }
--- a/js/src/nanojit/NativeX64.h
+++ b/js/src/nanojit/NativeX64.h
@@ -379,17 +379,17 @@ namespace nanojit
 
     #define swapptrs()  { NIns* _tins = _nIns; _nIns=_nExitIns; _nExitIns=_tins; }
 
     const int LARGEST_UNDERRUN_PROT = 32;  // largest value passed to underrunProtect
 
     typedef uint8_t NIns;
 
     // Bytes of icache to flush after Assembler::patch
-    const size_t LARGEST_BRANCH_PATCH = 16 * sizeof(Nins);
+    const size_t LARGEST_BRANCH_PATCH = 16 * sizeof(NIns);
 
     inline Register nextreg(Register r) {
         return Register(r+1);
     }
 
 } // namespace nanojit
 
 #endif // __nanojit_NativeX64__