Changeset 172746 in webkit
- Timestamp:
- Aug 19, 2014 12:14:30 AM (10 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r172742 r172746 1 2014-08-19 Michael Saboff <msaboff@apple.com> 2 3 REGRESSION(r163179): It broke the build on ARM Thumb2 with GCC 4 https://bugs.webkit.org/show_bug.cgi?id=136028 5 6 Reviewed by Oliver Hunt. 7 8 Added back ARMv7 conditionals around three op addp and subp since ARM Thumb2 spec says that 9 the behavior for those ops are undefined. This was originally done in changeset 163179. 10 11 * llint/LowLevelInterpreter32_64.asm: 12 1 13 2014-08-18 Commit Queue <commit-queue@webkit.org> 2 14 -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
r172665 r172746 204 204 end 205 205 206 vmEntryRecord(cfr, sp) 206 if ARMv7 207 vmEntryRecord(cfr, temp1) 208 move temp1, sp 209 else 210 vmEntryRecord(cfr, sp) 211 end 207 212 208 213 storep vm, VMEntryRecord::m_vm[sp] … … 220 225 addp CallFrameAlignSlots * SlotSize, sp, temp1 221 226 clrbp temp1, StackAlignmentMask, temp1 222 subp temp1, CallFrameAlignSlots * SlotSize, sp 227 if ARMv7 228 subp temp1, CallFrameAlignSlots * SlotSize, temp1 229 move temp1, sp 230 else 231 subp temp1, CallFrameAlignSlots * SlotSize, sp 232 end 223 233 end 224 234 … … 253 263 cCall2(_llint_throw_stack_overflow_error, vm, protoCallFrame) 254 264 255 vmEntryRecord(cfr, sp) 265 if ARMv7 266 vmEntryRecord(cfr, temp1) 267 move temp1, sp 268 else 269 vmEntryRecord(cfr, sp) 270 end 256 271 257 272 loadp VMEntryRecord::m_vm[sp], temp3 … … 261 276 storep temp4, VM::topVMEntryFrame[temp3] 262 277 263 subp cfr, CalleeRegisterSaveSize, sp 278 if ARMv7 279 subp cfr, CalleeRegisterSaveSize, temp3 280 move temp3, sp 281 else 282 subp cfr, CalleeRegisterSaveSize, sp 283 end 264 284 265 285 popCalleeSaves() … … 309 329 makeCall(entry, temp1, temp2) 310 330 311 vmEntryRecord(cfr, sp) 331 if ARMv7 332 vmEntryRecord(cfr, temp1) 333 move temp1, sp 334 else 335 vmEntryRecord(cfr, sp) 336 end 312 337 313 338 loadp VMEntryRecord::m_vm[sp], temp3 … … 317 342 storep temp4, VM::topVMEntryFrame[temp3] 318 343 319 subp cfr, CalleeRegisterSaveSize, sp 344 if ARMv7 345 subp cfr, CalleeRegisterSaveSize, temp3 346 move temp3, sp 347 else 348 subp cfr, CalleeRegisterSaveSize, sp 349 end 320 350 321 351 popCalleeSaves() … … 373 403 loadp CallerFrame + PayloadOffset[cfr], cfr 374 404 375 vmEntryRecord(cfr, sp) 405 if ARMv7 406 vmEntryRecord(cfr, t3) 407 move t3, sp 408 else 409 vmEntryRecord(cfr, sp) 410 end 376 411 377 412 loadp VMEntryRecord::m_vm[sp], t3 … … 381 416 storep t5, VM::topVMEntryFrame[t3] 382 417 383 subp cfr, CalleeRegisterSaveSize, sp 418 if ARMv7 419 subp cfr, CalleeRegisterSaveSize, t3 420 move t3, sp 421 else 422 subp cfr, CalleeRegisterSaveSize, sp 423 end 384 424 385 425 popCalleeSaves()
Note: See TracChangeset
for help on using the changeset viewer.