Changeset 159571 in webkit
- Timestamp:
- Nov 20, 2013 10:32:37 AM (10 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r159564 r159571 1 2013-11-20 Julien Brianceau <jbriance@cisco.com> 2 3 Fix CPU(ARM_TRADITIONAL) build after r159545. 4 https://bugs.webkit.org/show_bug.cgi?id=124649 5 6 Reviewed by Michael Saboff. 7 8 Add missing memoryFence, load8 and store8 implementations in macro assembler. 9 10 * assembler/ARMAssembler.h: 11 (JSC::ARMAssembler::dmbSY): 12 * assembler/MacroAssemblerARM.h: 13 (JSC::MacroAssemblerARM::load8): 14 (JSC::MacroAssemblerARM::store8): 15 (JSC::MacroAssemblerARM::memoryFence): 16 1 17 2013-11-20 Julien Brianceau <jbriance@cisco.com> 2 18 -
trunk/Source/JavaScriptCore/assembler/ARMAssembler.h
r159055 r159571 231 231 #endif 232 232 NOP = 0xe1a00000, 233 DMB_SY = 0xf57ff05f, 233 234 }; 234 235 … … 697 698 } 698 699 700 void dmbSY() 701 { 702 m_buffer.putInt(DMB_SY); 703 } 704 699 705 void bx(int rm, Condition cc = AL) 700 706 { -
trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
r159415 r159571 365 365 } 366 366 367 void load8(const void* address, RegisterID dest) 368 { 369 move(TrustedImmPtr(address), ARMRegisters::S0); 370 m_assembler.dataTransfer32(ARMAssembler::LoadUint8, dest, ARMRegisters::S0, 0); 371 } 372 367 373 void load8Signed(BaseIndex address, RegisterID dest) 368 374 { … … 452 458 { 453 459 m_assembler.baseIndexTransfer32(ARMAssembler::StoreUint8, src, address.base, address.index, static_cast<int>(address.scale), address.offset); 460 } 461 462 void store8(RegisterID src, const void* address) 463 { 464 move(TrustedImmPtr(address), ARMRegisters::S0); 465 m_assembler.dtrUp(ARMAssembler::StoreUint8, src, ARMRegisters::S0, 0); 454 466 } 455 467 … … 1303 1315 } 1304 1316 1317 void memoryFence() 1318 { 1319 m_assembler.dmbSY(); 1320 } 1321 1305 1322 static FunctionPtr readCallTarget(CodeLocationCall call) 1306 1323 {
Note: See TracChangeset
for help on using the changeset viewer.