Changeset 122594 in webkit
- Timestamp:
- Jul 13, 2012 9:35:46 AM (12 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r122544 r122594 1 2012-07-13 Patrick Gansterer <paroga@webkit.org> 2 3 Fix ARM_TRADITIONAL JIT for COMPILER(MSVC) and COMPILER(RVCT) after r121885 4 https://bugs.webkit.org/show_bug.cgi?id=91238 5 6 Reviewed by Zoltan Herczeg. 7 8 r121885 changed the assembler instruction only for COMPILER(GCC). 9 Use the same instructions for the other compilers too. 10 11 * jit/JITStubs.cpp: 12 (JSC::ctiTrampoline): 13 (JSC::ctiTrampolineEnd): 14 (JSC::ctiVMThrowTrampoline): 15 1 16 2012-07-12 Filip Pizlo <fpizlo@apple.com> 2 17 -
trunk/Source/JavaScriptCore/jit/JITStubs.cpp
r122206 r122594 741 741 ARM 742 742 stmdb sp!, {r1-r3} 743 stmdb sp!, {r4-r 8, lr}743 stmdb sp!, {r4-r6, r8-r11, lr} 744 744 sub sp, sp, # PRESERVEDR4_OFFSET 745 mov r 4, r2746 mov r 5, #512745 mov r5, r2 746 mov r6, #512 747 747 mov lr, pc 748 748 bx r0 749 749 add sp, sp, # PRESERVEDR4_OFFSET 750 ldmia sp!, {r4-r 8, lr}750 ldmia sp!, {r4-r6, r8-r11, lr} 751 751 add sp, sp, #12 752 752 bx lr 753 } 754 __asm void ctiTrampolineEnd() 755 { 753 756 } 754 757 … … 760 763 bl cti_vm_throw 761 764 add sp, sp, # PRESERVEDR4_OFFSET 762 ldmia sp!, {r4-r 8, lr}765 ldmia sp!, {r4-r6, r8-r11, lr} 763 766 add sp, sp, #12 764 767 bx lr … … 1213 1216 MSVC_BEGIN() 1214 1217 MSVC_BEGIN( EXPORT ctiTrampoline) 1218 MSVC_BEGIN( EXPORT ctiTrampolineEnd) 1215 1219 MSVC_BEGIN( EXPORT ctiVMThrowTrampoline) 1216 1220 MSVC_BEGIN( EXPORT ctiOpThrowNotCaught) … … 1218 1222 MSVC_BEGIN(ctiTrampoline PROC) 1219 1223 MSVC_BEGIN( stmdb sp!, {r1-r3}) 1220 MSVC_BEGIN( stmdb sp!, {r4-r 8, lr})1224 MSVC_BEGIN( stmdb sp!, {r4-r6, r8-r11, lr}) 1221 1225 MSVC_BEGIN( sub sp, sp, #68 ; sync with PRESERVEDR4_OFFSET) 1222 MSVC_BEGIN( mov r 4, r2)1223 MSVC_BEGIN( mov r 5, #512)1226 MSVC_BEGIN( mov r5, r2) 1227 MSVC_BEGIN( mov r6, #512) 1224 1228 MSVC_BEGIN( ; r0 contains the code) 1225 1229 MSVC_BEGIN( mov lr, pc) 1226 1230 MSVC_BEGIN( bx r0) 1227 1231 MSVC_BEGIN( add sp, sp, #68 ; sync with PRESERVEDR4_OFFSET) 1228 MSVC_BEGIN( ldmia sp!, {r4-r 8, lr})1232 MSVC_BEGIN( ldmia sp!, {r4-r6, r8-r11, lr}) 1229 1233 MSVC_BEGIN( add sp, sp, #12) 1230 1234 MSVC_BEGIN( bx lr) 1235 MSVC_BEGIN(ctiTrampolineEnd) 1231 1236 MSVC_BEGIN(ctiTrampoline ENDP) 1232 1237 MSVC_BEGIN() 1233 1238 MSVC_BEGIN(ctiVMThrowTrampoline PROC) 1234 1239 MSVC_BEGIN( mov r0, sp) 1235 MSVC_BEGIN( mov lr, pc)1236 1240 MSVC_BEGIN( bl cti_vm_throw) 1237 1241 MSVC_BEGIN(ctiOpThrowNotCaught) 1238 1242 MSVC_BEGIN( add sp, sp, #68 ; sync with PRESERVEDR4_OFFSET) 1239 MSVC_BEGIN( ldmia sp!, {r4-r 8, lr})1243 MSVC_BEGIN( ldmia sp!, {r4-r6, r8-r11, lr}) 1240 1244 MSVC_BEGIN( add sp, sp, #12) 1241 1245 MSVC_BEGIN( bx lr)
Note: See TracChangeset
for help on using the changeset viewer.