Changeset 39440 in webkit for trunk/JavaScriptCore/assembler/MacroAssembler.h

Timestamp:

Dec 22, 2008, 1:21:18 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-22 Sam Weinig <​[email protected]>

Reviewed by Gavin Barraclough.

Rename all uses of the term "repatch" to "patch".

• assembler/MacroAssembler.h: (JSC::MacroAssembler::DataLabelPtr::patch): (JSC::MacroAssembler::DataLabel32::patch): (JSC::MacroAssembler::Jump::patch): (JSC::MacroAssembler::PatchBuffer::PatchBuffer): (JSC::MacroAssembler::PatchBuffer::setPtr): (JSC::MacroAssembler::loadPtrWithAddressOffsetPatch): (JSC::MacroAssembler::storePtrWithAddressOffsetPatch): (JSC::MacroAssembler::storePtrWithPatch): (JSC::MacroAssembler::jnePtrWithPatch):
• assembler/X86Assembler.h: (JSC::X86Assembler::patchAddress): (JSC::X86Assembler::patchImmediate): (JSC::X86Assembler::patchPointer): (JSC::X86Assembler::patchBranchOffset):
• interpreter/Interpreter.cpp: (JSC::Interpreter::tryCTICachePutByID): (JSC::Interpreter::tryCTICacheGetByID): (JSC::Interpreter::cti_op_put_by_id): (JSC::Interpreter::cti_op_get_by_id): (JSC::Interpreter::cti_op_get_by_id_self_fail): (JSC::Interpreter::cti_op_get_by_id_proto_list): (JSC::Interpreter::cti_vm_dontLazyLinkCall):
• jit/JIT.cpp: (JSC::ctiPatchCallByReturnAddress): (JSC::JIT::privateCompileMainPass): (JSC::JIT::privateCompile): (JSC::JIT::privateCompileCTIMachineTrampolines):
• jit/JIT.h:
• jit/JITCall.cpp: (JSC::JIT::unlinkCall): (JSC::JIT::linkCall): (JSC::JIT::compileOpCall):
• jit/JITPropertyAccess.cpp: (JSC::JIT::compileGetByIdHotPath): (JSC::JIT::compilePutByIdHotPath): (JSC::JIT::compileGetByIdSlowCase): (JSC::JIT::compilePutByIdSlowCase): (JSC::JIT::privateCompilePutByIdTransition): (JSC::JIT::patchGetByIdSelf): (JSC::JIT::patchPutByIdReplace): (JSC::JIT::privateCompilePatchGetArrayLength): (JSC::JIT::privateCompileGetByIdSelf): (JSC::JIT::privateCompileGetByIdProto): (JSC::JIT::privateCompileGetByIdSelfList): (JSC::JIT::privateCompileGetByIdProtoList): (JSC::JIT::privateCompileGetByIdChainList): (JSC::JIT::privateCompileGetByIdChain): (JSC::JIT::privateCompilePutByIdReplace):

File:

• trunk/JavaScriptCore/assembler/MacroAssembler.h (modified) (16 diffs)

trunk/JavaScriptCore/assembler/MacroAssembler.h

@@ -149 +149 @@
 
     class Jump;
-    class RepatchBuffer;
+    class PatchBuffer;
 
     // DataLabelPtr:
     //
     // A DataLabelPtr is used to refer to a location in the code containing a pointer to be
-    // repatched after the code has been generated.
+    // patched after the code has been generated.
     class DataLabelPtr {
         friend class MacroAssembler;
-        friend class RepatchBuffer;
+        friend class PatchBuffer;
 
     public:
@@ -169 +169 @@
         }
 
-        static void repatch(void* address, void* value)
-        {
-            X86Assembler::repatchPointer(reinterpret_cast<intptr_t>(address), reinterpret_cast<intptr_t>(value));
+        static void patch(void* address, void* value)
+        {
+            X86Assembler::patchPointer(reinterpret_cast<intptr_t>(address), reinterpret_cast<intptr_t>(value));
         }
         
@@ -181 +181 @@
     //
     // A DataLabelPtr is used to refer to a location in the code containing a pointer to be
-    // repatched after the code has been generated.
+    // patched after the code has been generated.
     class DataLabel32 {
         friend class MacroAssembler;
-        friend class RepatchBuffer;
+        friend class PatchBuffer;
 
     public:
@@ -196 +196 @@
         }
 
-        static void repatch(void* address, int32_t value)
-        {
-            X86Assembler::repatchImmediate(reinterpret_cast<intptr_t>(address), value);
+        static void patch(void* address, int32_t value)
+        {
+            X86Assembler::patchImmediate(reinterpret_cast<intptr_t>(address), value);
         }
 
@@ -212 +212 @@
         friend class Jump;
         friend class MacroAssembler;
-        friend class RepatchBuffer;
+        friend class PatchBuffer;
 
     public:
@@ -251 +251 @@
     // Jumps may also be linked to a Label.
     class Jump {
-        friend class RepatchBuffer;
+        friend class PatchBuffer;
         friend class MacroAssembler;
 
@@ -281 +281 @@
         }
 
-        static void repatch(void* address, void* destination)
-        {
-            X86Assembler::repatchBranchOffset(reinterpret_cast<intptr_t>(address), destination);
+        static void patch(void* address, void* destination)
+        {
+            X86Assembler::patchBranchOffset(reinterpret_cast<intptr_t>(address), destination);
         }
 
@@ -295 +295 @@
     // All jumps in the set will be linked to the same destination.
     class JumpList {
-        friend class RepatchBuffer;
+        friend class PatchBuffer;
 
     public:
@@ -334 +334 @@
 
 
-    // RepatchBuffer:
+    // PatchBuffer:
     //
     // This class assists in linking code generated by the macro assembler, once code generation
@@ -351 +351 @@
     // address of calls, as opposed to a point that can be used to later relink a Jump -
     // possibly wrap the later up in an object that can do just that).
-    class RepatchBuffer {
+    class PatchBuffer {
     public:
-        RepatchBuffer(void* code)
+        PatchBuffer(void* code)
             : m_code(code)
         {
@@ -391 +391 @@
         void setPtr(DataLabelPtr label, void* value)
         {
-            X86Assembler::repatchAddress(m_code, label.m_label, value);
+            X86Assembler::patchAddress(m_code, label.m_label, value);
         }
 
@@ -666 +666 @@
     }
 
-    DataLabel32 loadPtrWithAddressOffsetRepatch(Address address, RegisterID dest)
+    DataLabel32 loadPtrWithAddressOffsetPatch(Address address, RegisterID dest)
     {
 #if PLATFORM(X86_64)
@@ -740 +740 @@
     }
 
-    DataLabel32 storePtrWithAddressOffsetRepatch(RegisterID src, Address address)
+    DataLabel32 storePtrWithAddressOffsetPatch(RegisterID src, Address address)
     {
 #if PLATFORM(X86_64)
@@ -770 +770 @@
     }
 
-    DataLabelPtr storePtrWithRepatch(Address address)
+    DataLabelPtr storePtrWithPatch(Address address)
     {
 #if PLATFORM(X86_64)
@@ -1220 +1220 @@
 #endif
 
-    Jump jnePtrWithRepatch(RegisterID reg, DataLabelPtr& dataLabel, ImmPtr initialValue = ImmPtr(0))
+    Jump jnePtrWithPatch(RegisterID reg, DataLabelPtr& dataLabel, ImmPtr initialValue = ImmPtr(0))
     {
 #if PLATFORM(X86_64)
@@ -1233 +1233 @@
     }
 
-    Jump jnePtrWithRepatch(Address address, DataLabelPtr& dataLabel, ImmPtr initialValue = ImmPtr(0))
+    Jump jnePtrWithPatch(Address address, DataLabelPtr& dataLabel, ImmPtr initialValue = ImmPtr(0))
     {
 #if PLATFORM(X86_64)