Backed out changeset 0ecba91f42b5 (bug 1194139)

This commit is contained in:
Carsten "Tomcat" Book 2015-08-31 16:17:41 +02:00
parent d817718e63
commit beab2e05c0
2 changed files with 5 additions and 5 deletions

View File

@ -240,7 +240,7 @@ class BaseFloatRegisters
f31,
invalid_freg
};
typedef uint32_t Code;
typedef FPRegisterID Code;
typedef FPRegisterID Encoding;
// Content spilled during bailouts.
@ -248,7 +248,7 @@ class BaseFloatRegisters
double d;
};
static const char* GetName(Encoding code) {
static const char* GetName(Code code) {
static const char * const Names[] = { "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7",
"f8", "f9", "f10", "f11", "f12", "f13",
"f14", "f15", "f16", "f17", "f18", "f19",
@ -257,7 +257,7 @@ class BaseFloatRegisters
return Names[code];
}
static const Encoding Invalid = invalid_freg;
static const Code Invalid = invalid_freg;
typedef uint64_t SetType;
};

View File

@ -64,7 +64,7 @@ class FloatRegisters : public BaseFloatRegisters
public:
static const char* GetName(uint32_t i) {
MOZ_ASSERT(i < Total);
return BaseFloatRegisters::GetName(Encoding(i % 32));
return GetName(Code(i % 32));
}
static Code FromName(const char* name);
@ -182,7 +182,7 @@ class FloatRegister : public BaseFloatRegister
}
Encoding encoding() const {
MOZ_ASSERT(!isInvalid());
return Encoding(code_);
return Code(code_ | (kind_ << 5));
}
uint32_t id() const {
return code_;