From 42e9d67975588cdc0c8c0c43fa04477c7d30efc9 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Mon, 31 Aug 2015 16:17:41 +0200
Subject: [PATCH] Backed out changeset 0ecba91f42b5 (bug 1194139)

---
 js/src/jit/mips-shared/Architecture-mips-shared.h | 6 +++---
 js/src/jit/mips32/Architecture-mips32.h           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/src/jit/mips-shared/Architecture-mips-shared.h b/js/src/jit/mips-shared/Architecture-mips-shared.h
index a88992fb0104..c0048e4d2086 100644
--- a/js/src/jit/mips-shared/Architecture-mips-shared.h
+++ b/js/src/jit/mips-shared/Architecture-mips-shared.h
@@ -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;
 };
diff --git a/js/src/jit/mips32/Architecture-mips32.h b/js/src/jit/mips32/Architecture-mips32.h
index eb8321eef7a7..0c9780079041 100644
--- a/js/src/jit/mips32/Architecture-mips32.h
+++ b/js/src/jit/mips32/Architecture-mips32.h
@@ -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_;