Title: [191123] trunk/Source/_javascript_Core
- Revision
- 191123
- Author
- mark....@apple.com
- Date
- 2015-10-15 11:37:38 -0700 (Thu, 15 Oct 2015)
Log Message
Refactoring: give the MASM probe CPUState methods shorter names.
https://bugs.webkit.org/show_bug.cgi?id=150177
Reviewed by Michael Saboff.
The existing names are longer than they need to be. Renaming them as follows:
For GPR, registerName ==> gprName
For GPR, registerValue ==> gpr
For FPR, registerName ==> fprName
For FPR, registerValue ==> fpr
* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::CPUState::gprName):
(JSC::AbstractMacroAssembler::CPUState::fprName):
(JSC::AbstractMacroAssembler::CPUState::gpr):
(JSC::AbstractMacroAssembler::CPUState::fpr):
(JSC::AbstractMacroAssembler::CPUState::registerName): Deleted.
(JSC::AbstractMacroAssembler::CPUState::registerValue): Deleted.
* assembler/MacroAssemblerPrinter.cpp:
(JSC::printRegister):
(JSC::printMemory):
- Updated to use the new names.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (191122 => 191123)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-15 18:37:38 UTC (rev 191123)
@@ -1,3 +1,29 @@
+2015-10-15 Mark Lam <mark....@apple.com>
+
+ Refactoring: give the MASM probe CPUState methods shorter names.
+ https://bugs.webkit.org/show_bug.cgi?id=150177
+
+ Reviewed by Michael Saboff.
+
+ The existing names are longer than they need to be. Renaming them as follows:
+ For GPR, registerName ==> gprName
+ For GPR, registerValue ==> gpr
+ For FPR, registerName ==> fprName
+ For FPR, registerValue ==> fpr
+
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::AbstractMacroAssembler::CPUState::gprName):
+ (JSC::AbstractMacroAssembler::CPUState::fprName):
+ (JSC::AbstractMacroAssembler::CPUState::gpr):
+ (JSC::AbstractMacroAssembler::CPUState::fpr):
+ (JSC::AbstractMacroAssembler::CPUState::registerName): Deleted.
+ (JSC::AbstractMacroAssembler::CPUState::registerValue): Deleted.
+
+ * assembler/MacroAssemblerPrinter.cpp:
+ (JSC::printRegister):
+ (JSC::printMemory):
+ - Updated to use the new names.
+
2015-10-15 Yusuke Suzuki <utatane....@gmail.com>
[ES6] Class _expression_ should have lexical environment that has itself as an imutable binding
Modified: trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (191122 => 191123)
--- trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2015-10-15 18:37:38 UTC (rev 191123)
@@ -852,7 +852,7 @@
FOR_EACH_CPU_REGISTER(DECLARE_REGISTER)
#undef DECLARE_REGISTER
- static const char* registerName(RegisterID regID)
+ static const char* gprName(RegisterID regID)
{
switch (regID) {
#define DECLARE_REGISTER(_type, _regName) \
@@ -864,7 +864,7 @@
RELEASE_ASSERT_NOT_REACHED();
}
- static const char* registerName(FPRegisterID regID)
+ static const char* fprName(FPRegisterID regID)
{
switch (regID) {
#define DECLARE_REGISTER(_type, _regName) \
@@ -876,7 +876,7 @@
RELEASE_ASSERT_NOT_REACHED();
}
- void* registerValue(RegisterID regID)
+ void* gpr(RegisterID regID)
{
switch (regID) {
#define DECLARE_REGISTER(_type, _regName) \
@@ -888,7 +888,7 @@
RELEASE_ASSERT_NOT_REACHED();
}
- double registerValue(FPRegisterID regID)
+ double fpr(FPRegisterID regID)
{
switch (regID) {
#define DECLARE_REGISTER(_type, _regName) \
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp (191122 => 191123)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp 2015-10-15 18:09:50 UTC (rev 191122)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerPrinter.cpp 2015-10-15 18:37:38 UTC (rev 191123)
@@ -91,23 +91,23 @@
void printRegister(CPUState& cpu, RegisterID regID)
{
- const char* name = CPUState::registerName(regID);
+ const char* name = CPUState::gprName(regID);
union {
void* voidPtr;
intptr_t intptrValue;
} u;
- u.voidPtr = cpu.registerValue(regID);
+ u.voidPtr = cpu.gpr(regID);
dataLogF("%s:<%p %ld>", name, u.voidPtr, u.intptrValue);
}
void printRegister(CPUState& cpu, FPRegisterID regID)
{
- const char* name = CPUState::registerName(regID);
+ const char* name = CPUState::fprName(regID);
union {
double doubleValue;
uint64_t uint64Value;
} u;
- u.doubleValue = cpu.registerValue(regID);
+ u.doubleValue = cpu.fpr(regID);
dataLogF("%s:<0x%016llx %.13g>", name, u.uint64Value, u.doubleValue);
}
@@ -116,7 +116,7 @@
uint8_t* ptr = nullptr;
switch (memory.addressType) {
case Memory::AddressType::Address: {
- ptr = reinterpret_cast<uint8_t*>(cpu.registerValue(memory.u.address.base));
+ ptr = reinterpret_cast<uint8_t*>(cpu.gpr(memory.u.address.base));
ptr += memory.u.address.offset;
break;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes