commit eaf09bc65f9a10d12befcdb239156938c9bceef2
author buzbee <buzbee@google.com> Thu Nov 15 14:51:41 2012 -0800
committer buzbee <buzbee@google.com> Fri Nov 16 16:48:09 2012 -0800
tree e3b85c241b24aa058a413363e4f9c94f4c76d4d6
parent efc6369224b036a1fb77849f7ae65b3492c832c0

Quick compiler: more refactoring

Focus on header file cleanup here.  Note: target_list.h
is transitional, and upcoming CLs will do additional header
file reorganization.

Change-Id: If86e1a8c1c43305762fe37b157a9d3c17d911ea7

src/compiler/codegen/mips/assemble_mips.cc

diff --git a/src/compiler/codegen/mips/assemble_mips.cc b/src/compiler/codegen/mips/assemble_mips.cc
index ab7a677..1fa3a6b 100644
--- a/src/compiler/codegen/mips/assemble_mips.cc
+++ b/src/compiler/codegen/mips/assemble_mips.cc
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-#include "../../dalvik.h"
-#include "../../compiler_internals.h"
 #include "mips_lir.h"
-#include "codegen.h"
+#include "../codegen_util.h"
 
 namespace art {
 
@@ -653,11 +651,11 @@
       continue;
     }
     const MipsEncodingMap *encoder = &EncodingMap[lir->opcode];
-    u4 bits = encoder->skeleton;
+    uint32_t bits = encoder->skeleton;
     int i;
     for (i = 0; i < 4; i++) {
-      u4 operand;
-      u4 value;
+      uint32_t operand;
+      uint32_t value;
       operand = lir->operands[i];
       switch (encoder->fieldLoc[i].kind) {
         case kFmtUnused:
@@ -703,7 +701,7 @@
     // TUNING: replace with proper delay slot handling
     if (encoder->size == 8) {
       const MipsEncodingMap *encoder = &EncodingMap[kMipsNop];
-      u4 bits = encoder->skeleton;
+      uint32_t bits = encoder->skeleton;
       cUnit->codeBuffer.push_back(bits & 0xff);
       cUnit->codeBuffer.push_back((bits >> 8) & 0xff);
       cUnit->codeBuffer.push_back((bits >> 16) & 0xff);