harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r660520 [1/3] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ include/ include/open/ interpreter/src/ jitrino/src/codegenerator/ia32/ jitrino/src/dynopt/ jitrino/src/jet/ jitrino/src/optimizer/ jitrino/src/shared/ jitrino/src/translator/ jit...
Date Tue, 27 May 2008 14:06:23 GMT
Author: mcfirst
Date: Tue May 27 07:05:55 2008
New Revision: 660520

URL: http://svn.apache.org/viewvc?rev=660520&view=rev
Log:
Unifying types with hycomp.h: replaced u/int8 with U/I_8

Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/include/interpreter_exports.h
    harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeParser.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeParser.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaTranslator.cpp
    harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h
    harmony/enhanced/drlvm/trunk/vm/port/src/atomic/linux_ipf/port_atomic_asm.asm
    harmony/enhanced/drlvm/trunk/vm/port/src/atomic/win/port_atomic_em64t.asm
    harmony/enhanced/drlvm/trunk/vm/port/src/encoder/ia32_em64t/encoder.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/bytereader.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions_jit.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/heap.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/mon_enter_exit.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_arrays.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_strings.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions_jit.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_class.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_method.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/em64t/lil_code_generator_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil_code_generator_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/ncai_utils_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/ncai_utils_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/utils/ncai_utils_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/object_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/bytereader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/merced.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_x.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/instr_props.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/tpool.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/instr_props_5.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java5/stackmap_5.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/x_verifier.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/x_verifier.h

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.cpp Tue May 27 07:05:55 2008
@@ -173,7 +173,7 @@
 void TNVTableFirstNManager::addNewValue(ValueMethodProfile* methProfile,
             VPData* instProfile, ValueT curr_value)
 {
-    uint8* updating_ptr = methProfile->getUpdatingStatePtr();
+    U_8* updating_ptr = methProfile->getUpdatingStatePtr();
     if (updateStrategy == UPDATE_LOCKED) {
         methProfile->lockProfile();
     } else if (updateStrategy == UPDATE_FLAGGED_ALL) {

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/NValueProfileCollector.h Tue May 27 07:05:55 2008
@@ -204,7 +204,7 @@
     //     (updatingState == 1) when method profile is being updated to skip
     //         concurrent modifications.
     //     (updatingState == 0) when profile is open for modifications.
-    uint8* getUpdatingStatePtr() { return &updatingState; }
+    U_8* getUpdatingStatePtr() { return &updatingState; }
 private:
     ValueProfileCollector* getVPC() const;
 
@@ -214,7 +214,7 @@
     // The lock and the atomically modified updatingState flag operate per
     // method to allow simultaneous updates for distinct methods.
     osmutex_t lock;
-    uint8 updatingState;
+    U_8 updatingState;
 };
 
 POINTER_SIZE_INT value_profiler_get_top_value (Method_Profile_Handle mph, U_32 instructionKey);

Modified: harmony/enhanced/drlvm/trunk/vm/include/interpreter_exports.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/interpreter_exports.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/interpreter_exports.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/interpreter_exports.h Tue May 27 07:05:55 2008
@@ -94,7 +94,7 @@
  *
  * @param frame - the pointer to the frame
  * @return The pointer to the bytecode.*/
-    uint8* (*interpreter_get_frame_bytecode_ptr) (FrameHandle* frame);
+    U_8* (*interpreter_get_frame_bytecode_ptr) (FrameHandle* frame);
     // 'end' is not inclusive
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h Tue May 27 07:05:55 2008
@@ -57,7 +57,7 @@
  * Various Numeric Types
  */
 
-// Boolean, uint8, int8, uint16, int16, uint64, int64,
+// Boolean, uint16, int16, uint64, int64,
 // POINTER_SIZE_INT
 
 // We can't use bool in non-C++ code
@@ -83,11 +83,9 @@
 # endif
 
 #ifdef PLATFORM_POSIX
-typedef unsigned char uint8;
 typedef unsigned short uint16;
 typedef unsigned long long uint64;
 
-typedef   signed char  int8;
 typedef   signed short int16;
 typedef   signed long long int64;
 
@@ -95,15 +93,11 @@
 
 #ifndef __INSURE__
 // these give Insure++ problems:
-typedef unsigned __int8  uint8;
 typedef unsigned __int16 uint16;
-typedef   signed __int8  int8;
 typedef   signed __int16 int16;
 #else
 // so use these definitions instead with Insure++:
-typedef unsigned char uint8;
 typedef unsigned short uint16;
-typedef   signed char int8;
 typedef   signed short int16;
 #endif
 typedef unsigned __int64 uint64;

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h Tue May 27 07:05:55 2008
@@ -238,7 +238,7 @@
 /**
  * extract the recursion counter from object lockword.
  */
-#define P_RECURSION_BYTE(x)       ( (uint8 *)(((x)->get_obj_info_addr())) + 1 )  
+#define P_RECURSION_BYTE(x)       ( (U_8 *)(((x)->get_obj_info_addr())) + 1 )  
 
 #ifdef GC_PUBLIC_PRIVATE
 

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h Tue May 27 07:05:55 2008
@@ -236,7 +236,7 @@
 /** The stack element value.*/
     Value *data;
 /** The value to the object reference.*/
-    uint8 *refs;
+    U_8 *refs;
 /** The number of elements on the stack.*/
     I_32 index;
 /** The stack size.*/
@@ -270,7 +270,7 @@
  * @param[in] offset - the offset value
  * @return The value to the object reference.
  */
-    inline uint8& ref(int offset = 0);
+    inline U_8& ref(int offset = 0);
     
 /**
  * Only moves the stack pointer.
@@ -352,7 +352,7 @@
     // local variable value
     Value *vars;
     // references to the local variable type
-    uint8 *refs;
+    U_8 *refs;
     // locals size
     U_32 varNum;
 
@@ -403,7 +403,7 @@
  * @return The reference to the local variable type.
  * @sa     FLAG_NONE, FLAG_RET_ADDR, FLAG_OBJECT
  */
-    inline uint8& ref(U_32 id);
+    inline U_8& ref(U_32 id);
 
 /**
  * Returns the size of the allocated locals area by its size in elements.
@@ -453,7 +453,7 @@
 struct StackFrame {
     public:
 /** The address of the bytecode being executed.*/
-    uint8 *ip;
+    U_8 *ip;
 /** The stack of this method.*/
     Stack stack;
 /** The local variables of this method.*/
@@ -476,7 +476,7 @@
     bool dump_bytecodes;
 #endif
 #ifdef INTERPRETER_DEEP_DEBUG
-    uint8 last_bytecodes[8];
+    U_8 last_bytecodes[8];
     int n_last_bytecode;
 #endif
 /** The <code>Exception</code> object that has been thrown and for which
@@ -496,7 +496,7 @@
  * The function for interpreter breakpoint processing.
  *
  * @param[in] frame - the method ID*/
-extern uint8 Opcode_BREAKPOINT(StackFrame& frame);
+extern U_8 Opcode_BREAKPOINT(StackFrame& frame);
 
 /**
  * Enumerates references associated with the thread.
@@ -662,7 +662,7 @@
 void
 Stack::init(void *ptr, int sz) {
     data = (Value*)ptr;
-    refs = (uint8*)(data + sz);
+    refs = (U_8*)(data + sz);
     size = sz;
     index = -1;
     for(int i = 0; i < size; i++) refs[i] = 0;
@@ -679,14 +679,14 @@
 void
 Locals::init(void *ptr, U_32 size) {
     vars = (Value*) ptr;
-    refs = (uint8*)(vars + size);
+    refs = (U_8*)(vars + size);
     varNum = size;
     for(U_32 i = 0; i < varNum; i++) refs[i] = 0;
 }
 
 int
 Locals::getStorageSize(int size) {
-    return (size * (sizeof(Value) + sizeof(uint8)) + 7) & ~7;
+    return (size * (sizeof(Value) + sizeof(U_8)) + 7) & ~7;
 }
 
 Value&
@@ -717,7 +717,7 @@
     return val;
 }
 
-uint8&
+U_8&
 Locals::ref(U_32 id) {
     assert(id < varNum);
     return refs[id];
@@ -729,7 +729,7 @@
     for(int i = 0; i < size; i++) refs[i] = 0;
 }
 
-uint8&
+U_8&
 Stack::ref(int offset) {
     assert(index - offset >= 0);
     return refs[index - offset];
@@ -785,7 +785,7 @@
 
 int
 Stack::getStorageSize(int size) {
-    return (size * (sizeof(Value) + sizeof(uint8)) + 7) & ~7;
+    return (size * (sizeof(Value) + sizeof(U_8)) + 7) & ~7;
 }
 
 /** Sets up locals and stack on the C stack.*/

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp Tue May 27 07:05:55 2008
@@ -83,7 +83,7 @@
 extern FrameHandle* interpreter_get_last_frame(struct VM_thread *thread);
 extern FrameHandle* interpreter_get_prev_frame(FrameHandle* frame);
 extern Method_Handle interpreter_get_frame_method(FrameHandle* frame);
-extern uint8* interpreter_get_frame_bytecode_ptr(FrameHandle* frame);
+extern U_8* interpreter_get_frame_bytecode_ptr(FrameHandle* frame);
 extern bool is_frame_in_native_frame(FrameHandle* frame, void* begin, void* end);
 
 void EXPORT JIT_init(JIT_Handle UNREF h, const char* UNREF name, vm_adaptor_t adaptor) {

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp Tue May 27 07:05:55 2008
@@ -43,7 +43,7 @@
 typedef float (*FloatFuncPtr)(uword*,uword,word,GenericFunctionPointer);
 typedef I_32 (*IntFuncPtr)(uword*,uword,word,GenericFunctionPointer);
 typedef int16 (*ShortFuncPtr)(uword*,uword,word,GenericFunctionPointer);
-typedef int8 (*ByteFuncPtr)(uword*,uword,word,GenericFunctionPointer);
+typedef I_8 (*ByteFuncPtr)(uword*,uword,word,GenericFunctionPointer);
 typedef uint16 (*CharFuncPtr)(uword*,uword,word,GenericFunctionPointer);
 
 DoubleFuncPtr invokeJNI_Double = (DoubleFuncPtr) invokeJNI;
@@ -457,7 +457,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(out_args, n_fps, n_stacks, f);
+                I_8 res = invokeJNI_Byte(out_args, n_fps, n_stacks, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 
@@ -736,7 +736,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(out_args, n_fps, n_stacks, f);
+                I_8 res = invokeJNI_Byte(out_args, n_fps, n_stacks, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ia32.cpp Tue May 27 07:05:55 2008
@@ -61,7 +61,7 @@
 typedef float (*FloatFuncPtr)(uword*,int,GenericFunctionPointer);
 typedef I_32 (*IntFuncPtr)(uword*,int,GenericFunctionPointer);
 typedef int16 (*ShortFuncPtr)(uword*,int,GenericFunctionPointer);
-typedef int8 (*ByteFuncPtr)(uword*,int,GenericFunctionPointer);
+typedef I_8 (*ByteFuncPtr)(uword*,int,GenericFunctionPointer);
 typedef uint16 (*CharFuncPtr)(uword*,int,GenericFunctionPointer);
 
 DoubleFuncPtr invokeJNI_Double = (DoubleFuncPtr) invokeJNI;
@@ -370,7 +370,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(args, argId, f);
+                I_8 res = invokeJNI_Byte(args, argId, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 
@@ -592,7 +592,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(args, argId, f);
+                I_8 res = invokeJNI_Byte(args, argId, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_ipf.cpp Tue May 27 07:05:55 2008
@@ -58,7 +58,7 @@
     double invokeJNI_Double(uword*,uword*,int64,int64,GenericFunctionPointer);
     I_32 invokeJNI_Int(uword*,uword*,int64,int64,GenericFunctionPointer);
     int16 invokeJNI_Short(uword*,uword*,int64,int64,GenericFunctionPointer);
-    int8 invokeJNI_Byte(uword*,uword*,int64,int64,GenericFunctionPointer);
+    I_8 invokeJNI_Byte(uword*,uword*,int64,int64,GenericFunctionPointer);
     uint16 invokeJNI_Char(uword*,uword*,int64,int64,GenericFunctionPointer);
 }
 
@@ -430,7 +430,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(args, fpargs, argId, frameSize, f);
+                I_8 res = invokeJNI_Byte(args, fpargs, argId, frameSize, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 
@@ -698,7 +698,7 @@
         case JAVA_TYPE_BOOLEAN:
         case JAVA_TYPE_BYTE:
             {
-                int8 res = invokeJNI_Byte(args, fpargs, argId, frameSize, f);
+                I_8 res = invokeJNI_Byte(args, fpargs, argId, frameSize, f);
                 hythread_suspend_disable();
                 prevFrame.stack.popClearRef(sz);
 

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Tue May 27 07:05:55 2008
@@ -105,28 +105,28 @@
 /****************************************************/
 
 static inline int16
-read_uint8(uint8 *addr) {
+read_uint8(U_8 *addr) {
     return *addr;
 }
 
 static inline int16
-read_int8(uint8 *addr) {
-    return ((int8*)addr)[0];
+read_int8(U_8 *addr) {
+    return ((I_8*)addr)[0];
 }
 
 static inline int16
-read_int16(uint8 *addr) {
-    int res = (((int8*)addr)[0] << 8);
+read_int16(U_8 *addr) {
+    int res = (((I_8*)addr)[0] << 8);
     return (int16)(res + (int)addr[1]);
 }
 
 static inline uint16
-read_uint16(uint8 *addr) {
+read_uint16(U_8 *addr) {
     return (int16)((addr[0] << 8) + addr[1]);
 }
 
 static inline I_32
-read_int32(uint8 *addr) {
+read_int32(U_8 *addr) {
     U_32 res = (addr[0] << 24) + (addr[1] << 16) + (addr[2] << 8) + addr[3];
     return (I_32) res;
 }
@@ -688,7 +688,7 @@
 
 DEF_OPCODE_MATH_32_TO_32(I2F, res.f = (float) arg.i)     // Opcode_I2F
 //DEF_OPCODE_MATH_32_TO_32(F2I, res.i = (I_32) arg.f)     // Opcode_F2I
-DEF_OPCODE_MATH_32_TO_32(I2B, res.i = (int8) arg.i)      // Opcode_I2B
+DEF_OPCODE_MATH_32_TO_32(I2B, res.i = (I_8) arg.i)      // Opcode_I2B
 DEF_OPCODE_MATH_32_TO_32(I2S, res.i = (int16) arg.i)     // Opcode_I2S
 DEF_OPCODE_MATH_32_TO_32(I2C, res.i = (uint16) arg.i)    // Opcode_I2C
 
@@ -1287,7 +1287,7 @@
     frame.stack.pick(0) = frame.stack.pick(1);
     frame.stack.pick(1) = tmp;
 
-    uint8 ref = frame.stack.ref(0);
+    U_8 ref = frame.stack.ref(0);
     frame.stack.ref(0) = frame.stack.ref(1);
     frame.stack.ref(1) = ref;
     frame.ip++;
@@ -1466,7 +1466,7 @@
     frame.ip++;                                                                 \
 }
 
-DEF_OPCODE_XALOAD(BALOAD, int8, int8, i)
+DEF_OPCODE_XALOAD(BALOAD, int8, I_8, i)
 DEF_OPCODE_XALOAD(CALOAD, uint16, uint16, u)
 DEF_OPCODE_XALOAD(SALOAD, int16, int16, i)
 DEF_OPCODE_XALOAD(IALOAD, int32, I_32, i)
@@ -1569,7 +1569,7 @@
 #endif
 
 DEF_OPCODE_IASTORE(CASTORE, uint16, uint16, u)
-DEF_OPCODE_IASTORE(BASTORE, int8, int8, i)
+DEF_OPCODE_IASTORE(BASTORE, int8, I_8, i)
 DEF_OPCODE_IASTORE(SASTORE, int16, int16, i)
 DEF_OPCODE_IASTORE(IASTORE, int32, I_32, i)
 DEF_OPCODE_IASTORE(FASTORE, f32, float, f)
@@ -1644,7 +1644,7 @@
 #ifdef COMPACT_FIELDS // use compact fields on ipf
         case VM_DATA_TYPE_BOOLEAN:
         case VM_DATA_TYPE_INT8:
-            *(uint8*)addr = (uint8) frame.stack.pick().u;
+            *(U_8*)addr = (U_8) frame.stack.pick().u;
             frame.stack.pop();
             break;
 
@@ -1656,7 +1656,7 @@
 
 #else // ia32 not using compact fields
         case VM_DATA_TYPE_BOOLEAN:
-            *(U_32*)addr = (uint8) frame.stack.pick().u;
+            *(U_32*)addr = (U_8) frame.stack.pick().u;
             frame.stack.pop();
             break;
         case VM_DATA_TYPE_CHAR:
@@ -1665,7 +1665,7 @@
             break;
 
         case VM_DATA_TYPE_INT8:
-            *(I_32*)addr = (int8) frame.stack.pick().i;
+            *(I_32*)addr = (I_8) frame.stack.pick().i;
             frame.stack.pop();
             break;
         case VM_DATA_TYPE_INT16:
@@ -1732,11 +1732,11 @@
     switch (field->get_java_type()) {
 #ifdef COMPACT_FIELDS // use compact fields on ipf
         case VM_DATA_TYPE_BOOLEAN:
-            frame.stack.pick().u = *(uint8*)addr;
+            frame.stack.pick().u = *(U_8*)addr;
             break;
 
         case VM_DATA_TYPE_INT8:
-            frame.stack.pick().i = *(int8*)addr;
+            frame.stack.pick().i = *(I_8*)addr;
             break;
 
         case VM_DATA_TYPE_CHAR:
@@ -1824,14 +1824,14 @@
     }
 
     ManagedObject *obj = UNCOMPRESS_INTERP(ref);
-    uint8* addr = ((uint8*)obj) + field->get_offset();
+    U_8* addr = ((U_8*)obj) + field->get_offset();
 
     switch (field->get_java_type()) {
 
 #ifdef COMPACT_FIELDS // use compact fields on ipf
         case VM_DATA_TYPE_BOOLEAN:
         case VM_DATA_TYPE_INT8:
-            *(uint8*)addr = (uint8)frame.stack.pick(0).u;
+            *(U_8*)addr = (U_8)frame.stack.pick(0).u;
             frame.stack.ref(1) = FLAG_NONE;
             frame.stack.pop(2);
             break;
@@ -1845,13 +1845,13 @@
 
 #else // ia32 not using compact fields
         case VM_DATA_TYPE_BOOLEAN:
-            *(U_32*)addr = (uint8)frame.stack.pick(0).u;
+            *(U_32*)addr = (U_8)frame.stack.pick(0).u;
             frame.stack.ref(1) = FLAG_NONE;
             frame.stack.pop(2);
             break;
 
         case VM_DATA_TYPE_INT8:
-            *(I_32*)addr = (int8)frame.stack.pick(0).i;
+            *(I_32*)addr = (I_8)frame.stack.pick(0).i;
             frame.stack.ref(1) = FLAG_NONE;
             frame.stack.pop(2);
             break;
@@ -1923,18 +1923,18 @@
         return;
     }
     ManagedObject *obj = UNCOMPRESS_INTERP(ref);
-    uint8 *addr = ((uint8*)obj) + field->get_offset();
+    U_8 *addr = ((U_8*)obj) + field->get_offset();
     frame.stack.ref() = FLAG_NONE;
 
     switch (field->get_java_type()) {
 
 #ifdef COMPACT_FIELDS // use compact fields on ipf
         case VM_DATA_TYPE_BOOLEAN:
-            frame.stack.pick(0).u = (U_32) *(uint8*)addr;
+            frame.stack.pick(0).u = (U_32) *(U_8*)addr;
             break;
 
         case VM_DATA_TYPE_INT8:
-            frame.stack.pick(0).i = (I_32) *(int8*)addr;
+            frame.stack.pick(0).i = (I_32) *(I_8*)addr;
             break;
 
         case VM_DATA_TYPE_CHAR:
@@ -2064,10 +2064,10 @@
 
 static inline void
 Opcode_TABLESWITCH(StackFrame& frame) {
-    uint8* oldip = frame.ip;
-    uint8* ip = frame.ip + 1;
-    ip = ((ip - (uint8*)frame.method->get_byte_code_addr() + 3) & ~3)
-        + (uint8*)frame.method->get_byte_code_addr();
+    U_8* oldip = frame.ip;
+    U_8* ip = frame.ip + 1;
+    ip = ((ip - (U_8*)frame.method->get_byte_code_addr() + 3) & ~3)
+        + (U_8*)frame.method->get_byte_code_addr();
     I_32 deflt = read_int32(ip);
     I_32 low =   read_int32(ip+4);
     I_32 high =    read_int32(ip+8);
@@ -2085,10 +2085,10 @@
 
 static inline void
 Opcode_LOOKUPSWITCH(StackFrame& frame) {
-    uint8* oldip = frame.ip;
-    uint8* ip = frame.ip + 1;
-    ip = ((ip - (uint8*)frame.method->get_byte_code_addr() + 3) & ~3)
-        + (uint8*)frame.method->get_byte_code_addr();
+    U_8* oldip = frame.ip;
+    U_8* ip = frame.ip + 1;
+    ip = ((ip - (U_8*)frame.method->get_byte_code_addr() + 3) & ~3)
+        + (U_8*)frame.method->get_byte_code_addr();
     I_32 deflt = read_int32(ip);
     I_32 num = read_int32(ip+4);
     I_32 val = frame.stack.pick().i;
@@ -2125,7 +2125,7 @@
 static inline void
 Opcode_JSR(StackFrame& frame) {
     U_32 retAddr = (U_32)(frame.ip + 3 -
-        (uint8*)frame.method->get_byte_code_addr());
+        (U_8*)frame.method->get_byte_code_addr());
     frame.stack.push();
     frame.stack.pick().u = retAddr;
     frame.stack.ref() = FLAG_RET_ADDR;
@@ -2136,7 +2136,7 @@
 static inline void
 Opcode_JSR_W(StackFrame& frame) {
     U_32 retAddr = (U_32)(frame.ip + 5 -
-        (uint8*)frame.method->get_byte_code_addr());
+        (U_8*)frame.method->get_byte_code_addr());
     frame.stack.push();
     frame.stack.pick().u = retAddr;
     frame.stack.ref() = FLAG_RET_ADDR;
@@ -2149,14 +2149,14 @@
     U_32 varNum = read_uint8(frame.ip + 1);
     U_32 retAddr = frame.locals(varNum).u;
     assert(frame.locals.ref(varNum) == FLAG_RET_ADDR);
-    frame.ip = retAddr + (uint8*)frame.method->get_byte_code_addr();
+    frame.ip = retAddr + (U_8*)frame.method->get_byte_code_addr();
 }
 
 static inline void
 Opcode_WIDE_RET(StackFrame& frame) {
     U_32 varNum = read_uint16(frame.ip + 2);
     U_32 retAddr = frame.locals(varNum).u;
-    frame.ip = retAddr + (uint8*)frame.method->get_byte_code_addr();
+    frame.ip = retAddr + (U_8*)frame.method->get_byte_code_addr();
 }
 
 static inline void
@@ -2271,7 +2271,7 @@
     DEBUG_BYTECODE("Searching for exception handler:");
     DEBUG_BYTECODE("   In " << m);
 
-    U_32 ip = (U_32)(frame.ip - (uint8*)m->get_byte_code_addr());
+    U_32 ip = (U_32)(frame.ip - (U_8*)m->get_byte_code_addr());
     DEBUG_BYTECODE("ip = " << (int)ip);
 
     // When VM is in shutdown stage we need to execute final block to
@@ -2330,7 +2330,7 @@
     if (findExceptionHandler(frame, exception, &h)){
         DEBUG_BYTECODE("Exception caught: " << (*exception));
         DEBUG_BYTECODE("Found handler!\n");
-        frame.ip = (uint8*)m->get_byte_code_addr() + h->get_handler_pc();
+        frame.ip = (U_8*)m->get_byte_code_addr() + h->get_handler_pc();
         return true;
     }
     return false;
@@ -2495,8 +2495,8 @@
 
 void
 interpreter(StackFrame &frame) {
-    uint8 *first = NULL;
-    uint8 ip0 = 0;
+    U_8 *first = NULL;
+    U_8 ip0 = 0;
     bool breakpoint_processed = false;
     int stackLength = 0;
     size_t available;
@@ -2530,7 +2530,7 @@
         }
     }
 
-    frame.ip = (uint8*) frame.method->get_byte_code_addr();
+    frame.ip = (U_8*) frame.method->get_byte_code_addr();
 
     if (interpreter_ti_notification_mode
             & INTERPRETER_TI_METHOD_ENTRY_EVENT) {
@@ -2935,7 +2935,7 @@
 
             case OPCODE_WIDE:
             {
-                uint8* ip1 = frame.ip + 1;
+                U_8* ip1 = frame.ip + 1;
                 switch(*ip1) {
                     case OPCODE_ALOAD: Opcode_WIDE_ALOAD(frame); break;
                     case OPCODE_ILOAD: Opcode_WIDE_ILOAD(frame); break;

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter_ti.cpp Tue May 27 07:05:55 2008
@@ -307,8 +307,8 @@
         if (m->is_native())
             frame_buffer[count].location = -1;
         else
-            frame_buffer[count].location = (jlocation)((uint8*)frame->ip -
-                    (uint8*)m->get_byte_code_addr());
+            frame_buffer[count].location = (jlocation)((U_8*)frame->ip -
+                    (U_8*)m->get_byte_code_addr());
 
         frame = frame->prev;
         count++;
@@ -338,18 +338,18 @@
     if (m->is_native()) {
         *location_ptr = -1;
     } else {
-        *location_ptr = (jlocation)((uint8*)frame->ip -
-                (uint8*)frame->method->get_byte_code_addr());
+        *location_ptr = (jlocation)((U_8*)frame->ip -
+                (U_8*)frame->method->get_byte_code_addr());
     }
     return JVMTI_ERROR_NONE;
 }
 
-uint8
+U_8
 Opcode_BREAKPOINT(StackFrame& frame) {
     Method *m = frame.method;
-    jlocation l = frame.ip - (uint8*)m->get_byte_code_addr();
+    jlocation l = frame.ip - (U_8*)m->get_byte_code_addr();
     M2N_ALLOC_MACRO;
-    uint8 b = (uint8) (POINTER_SIZE_INT) jvmti_process_interpreter_breakpoint_event((jmethodID)m, l);
+    U_8 b = (U_8) (POINTER_SIZE_INT) jvmti_process_interpreter_breakpoint_event((jmethodID)m, l);
     if(b == OPCODE_COUNT) {
         // breakpoint was remove by another thread, get original opcode
         b = *(frame.ip);
@@ -360,15 +360,15 @@
 
 jbyte interpreter_ti_set_breakpoint(jmethodID method, jlocation location) {
     Method *m = (Method*) method;
-    uint8 *bytecodes = (uint8*) m->get_byte_code_addr();
-    uint8 b = bytecodes[location];
+    U_8 *bytecodes = (U_8*) m->get_byte_code_addr();
+    U_8 b = bytecodes[location];
     bytecodes[location] = OPCODE_BREAKPOINT;
     return b;
 }
 
 void interpreter_ti_clear_breakpoint(jmethodID method, jlocation location, jbyte saved) {
     Method *m = (Method*) method;
-    uint8 *bytecodes = (uint8*) m->get_byte_code_addr();
+    U_8 *bytecodes = (U_8*) m->get_byte_code_addr();
     bytecodes[location] = saved;
 }
 
@@ -492,12 +492,12 @@
 
 
 void single_step_callback(StackFrame &frame) {
-    uint8 ip0 = *frame.ip;
+    U_8 ip0 = *frame.ip;
     hythread_suspend_enable();
     Method *method = frame.method;
     
     jvmti_process_single_step_event((jmethodID) method,
-            frame.ip - (uint8*)method->get_byte_code_addr());
+            frame.ip - (U_8*)method->get_byte_code_addr());
 
     hythread_suspend_disable();
 }
@@ -522,7 +522,7 @@
     return (Method_Handle)((StackFrame*)frame)->method;
 }
 
-uint8* interpreter_get_frame_bytecode_ptr(FrameHandle* frame)
+U_8* interpreter_get_frame_bytecode_ptr(FrameHandle* frame)
 {
     return ((StackFrame*)frame)->ip;
 }
@@ -548,7 +548,7 @@
 
 static inline void field_access_callback(Field *field, StackFrame& frame, ManagedObject *obj) {
     Method *method = frame.method;
-    jlocation pc = frame.ip - (uint8*)method->get_code_addr();
+    jlocation pc = frame.ip - (U_8*)method->get_code_addr();
 
     M2N_ALLOC_MACRO;
 
@@ -559,7 +559,7 @@
 
 static inline void field_modification_callback(Field *field, StackFrame& frame, ManagedObject * obj, jvalue val) {
     Method *method = frame.method;
-    jlocation pc = frame.ip - (uint8*)method->get_code_addr();
+    jlocation pc = frame.ip - (U_8*)method->get_code_addr();
     jvmti_process_field_modification_event(field, (jmethodID) method, pc, obj, val);
 }
 
@@ -581,9 +581,9 @@
     jvalue val;
     val.l = 0;
     switch (field->get_java_type()) {
-        case VM_DATA_TYPE_BOOLEAN: val.z = (uint8) frame.stack.pick().u; break;
+        case VM_DATA_TYPE_BOOLEAN: val.z = (U_8) frame.stack.pick().u; break;
         case VM_DATA_TYPE_CHAR: val.c = (uint16) frame.stack.pick().u; break;
-        case VM_DATA_TYPE_INT8: val.b = (int8) frame.stack.pick().i; break;
+        case VM_DATA_TYPE_INT8: val.b = (I_8) frame.stack.pick().i; break;
         case VM_DATA_TYPE_INT16: val.s = (int16) frame.stack.pick().i; break;
         case VM_DATA_TYPE_INT32: val.i = frame.stack.pick().i; break;
         case VM_DATA_TYPE_INT64: val.j = frame.stack.getLong(0).i64; break;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BranchTrans.cpp Tue May 27 07:05:55 2008
@@ -100,8 +100,8 @@
 static bool branchDirection (int64 v1, int64 v2, OpndSize sz,ConditionMnemonic mn) {
     switch (sz) {
         case OpndSize_8:
-            v1 = int64(int8(v1));
-            v2 = int64(int8(v2));
+            v1 = int64(I_8(v1));
+            v2 = int64(I_8(v2));
             break;
         case OpndSize_16:
             v1 = int64(int16(v1));

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CFG.cpp Tue May 27 07:05:55 2008
@@ -43,7 +43,7 @@
 }
 
 void* BasicBlock::getCodeStartAddr() const  {
-    return (uint8*)irm.getCodeStartAddr()+getCodeOffset(); 
+    return (U_8*)irm.getCodeStartAddr()+getCodeOffset(); 
 }
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp Tue May 27 07:05:55 2008
@@ -458,7 +458,7 @@
     const unsigned maxMethodSize = (irManager->getMaxInstId() + irManager->getFlowGraph()->getMaxNodeId())*MAX_NATIVE_INST_SIZE;
 
     //
-    uint8 * codeStreamStart = (uint8*)malloc( maxMethodSize );
+    U_8 * codeStreamStart = (U_8*)malloc( maxMethodSize );
     //+---- free() below
     //|
     //v
@@ -471,22 +471,22 @@
     
     LoopTree * lt = irManager->getFlowGraph()->getLoopTree();
 
-    uint8 * ip = codeStreamStart;
+    U_8 * ip = codeStreamStart;
     for( BasicBlock * bb = (BasicBlock*)irManager->getFlowGraph()->getEntryNode(); bb != NULL; bb=bb->getLayoutSucc()) {
 
         assert(bb->getFirstInst()!=NULL);
         if (alignment && lt->isLoopHeader(bb) && ((POINTER_SIZE_INT)ip & (alignment-1))) {
             unsigned align = alignment - (unsigned)((POINTER_SIZE_INT)ip & (alignment-1));
-            ip = (uint8*)EncoderBase::nops((char*)ip, align);
+            ip = (U_8*)EncoderBase::nops((char*)ip, align);
         }
 
-        uint8 * blockStartIp = ip;
+        U_8 * blockStartIp = ip;
         assert(fit32(blockStartIp-codeStreamStart));
         bb->setCodeOffset( (U_32)(blockStartIp-codeStreamStart) );
         for (Inst* inst = (Inst*)bb->getFirstInst(); inst!=NULL; inst = inst->getNextInst()) {
             if( inst->hasKind(Inst::Kind_PseudoInst)) {
                 
-                uint8 * instStartIp = ip;
+                U_8 * instStartIp = ip;
                 inst->setCodeOffset( (U_32)(instStartIp-blockStartIp) );
                 continue;
             }
@@ -511,16 +511,16 @@
                     nopInst->setCodeOffset( (U_32)(ip-blockStartIp) );
                     ip = nopInst->emit(ip);
                     // the last two
-                    ip = (uint8*)EncoderBase::nops((char*)ip,2);
+                    ip = (U_8*)EncoderBase::nops((char*)ip,2);
                 }
 #ifdef _EM64T_
                     // these nops are required for call transformation from immediate into register form
                     // nops for MOV r11, callTarget (when !fit32(call_offset) ) <opcode + 8 byte address>
-                    ip = (uint8*)EncoderBase::nops((char*)ip, 10);
+                    ip = (U_8*)EncoderBase::nops((char*)ip, 10);
 #endif
             }
             
-            uint8 * instStartIp = ip;
+            U_8 * instStartIp = ip;
             assert(fit32(instStartIp-blockStartIp));
             inst->setCodeOffset( (U_32)(instStartIp-blockStartIp) );
             ip = inst->emit(ip);
@@ -543,7 +543,7 @@
     unsigned codeSize = (unsigned)(ip-codeStreamStart);
     assert( codeSize < maxMethodSize );
 
-    uint8 * codeBlock = (uint8*)irManager->getCompilationInterface().allocateCodeBlock(
+    U_8 * codeBlock = (U_8*)irManager->getCompilationInterface().allocateCodeBlock(
             codeSize , JMP_TARGET_ALIGMENT, getCodeSectionHeat(0), 0, false );
     memcpy(codeBlock, codeStreamStart, codeSize); 
     irManager->setCodeStartAddr(codeBlock);
@@ -569,14 +569,14 @@
                 else if (inst->hasKind(Inst::Kind_JmpInst))
                     bbTarget = (BasicBlock*)bb->getUnconditionalEdgeTarget();
                 if (bbTarget != NULL){
-                    uint8 * instCodeStartAddr = (uint8*)inst->getCodeStartAddr();
-                    uint8 * instCodeEndAddr = (uint8*)instCodeStartAddr+inst->getCodeSize();
-                    uint8 * targetCodeStartAddr = (uint8*)bbTarget->getCodeStartAddr();
+                    U_8 * instCodeStartAddr = (U_8*)inst->getCodeStartAddr();
+                    U_8 * instCodeEndAddr = (U_8*)instCodeStartAddr+inst->getCodeSize();
+                    U_8 * targetCodeStartAddr = (U_8*)bbTarget->getCodeStartAddr();
                     U_32 targetOpndIndex = ((ControlTransferInst*)inst)->getTargetOpndIndex();
                     int64 offset=targetCodeStartAddr-instCodeEndAddr;               
                     if (offset >= -128 && offset < 127 && inst->getOpnd(targetOpndIndex)->getSize() != OpndSize_8) {
                         inst->setOpnd(targetOpndIndex, irManager->newImmOpnd(irManager->getTypeFromTag(Type::Int8), offset));
-                        uint8 * newInstCodeEndAddr = inst->emit(instCodeStartAddr);
+                        U_8 * newInstCodeEndAddr = inst->emit(instCodeStartAddr);
                         bb->setCodeSize(bb->getCodeSize() + (U_32)(newInstCodeEndAddr - instCodeEndAddr));
                         newOpndsCreated = true;
                     } 
@@ -590,9 +590,9 @@
                 int succCodeSize = succ->getCodeSize();
                 int bbDisplacement = succCodeOffset - bbCodeOffset - bbCodeSize;
                 if (bbDisplacement != 0){
-                    uint8 * ps = (uint8*)irManager->getCodeStartAddr() + succCodeOffset;
-                    uint8 * pd = ps - bbDisplacement;
-                    uint8 * pn = ps + succCodeSize; 
+                    U_8 * ps = (U_8*)irManager->getCodeStartAddr() + succCodeOffset;
+                    U_8 * pd = ps - bbDisplacement;
+                    U_8 * pn = ps + succCodeSize; 
                     while (ps < pn)
                         *pd++ = *ps++;
                     succ->setCodeOffset(succCodeOffset - bbDisplacement);
@@ -613,20 +613,20 @@
             if (inst->hasKind(Inst::Kind_ControlTransferInst) && 
                 ((ControlTransferInst*)inst)->isDirect()
             ){
-                uint8 * instCodeStartAddr=(uint8*)inst->getCodeStartAddr();
-                uint8 * instCodeEndAddr=(uint8*)instCodeStartAddr+inst->getCodeSize();
-                uint8 * targetCodeStartAddr=0;
+                U_8 * instCodeStartAddr=(U_8*)inst->getCodeStartAddr();
+                U_8 * instCodeEndAddr=(U_8*)instCodeStartAddr+inst->getCodeSize();
+                U_8 * targetCodeStartAddr=0;
                 U_32 targetOpndIndex = ((ControlTransferInst*)inst)->getTargetOpndIndex();
                 MethodDesc * md = NULL;
                 if (inst->hasKind(Inst::Kind_BranchInst)){
                     BasicBlock * bbTarget=(BasicBlock*)((BranchInst*)inst)->getTrueTarget();
-                    targetCodeStartAddr=(uint8*)bbTarget->getCodeStartAddr();
+                    targetCodeStartAddr=(U_8*)bbTarget->getCodeStartAddr();
                 } else if (inst->hasKind(Inst::Kind_JmpInst)){
                     BasicBlock* bbTarget = (BasicBlock*)bb->getUnconditionalEdgeTarget();
-                    targetCodeStartAddr=(uint8*)bbTarget->getCodeStartAddr();
+                    targetCodeStartAddr=(U_8*)bbTarget->getCodeStartAddr();
                 } else if (inst->hasKind(Inst::Kind_CallInst)){
                     Opnd * targetOpnd=inst->getOpnd(targetOpndIndex);
-                    targetCodeStartAddr=(uint8*)(POINTER_SIZE_INT)targetOpnd->getImmValue();
+                    targetCodeStartAddr=(U_8*)(POINTER_SIZE_INT)targetOpnd->getImmValue();
                     Opnd::RuntimeInfo * ri=targetOpnd->getRuntimeInfo();
                     if ( ri && ri->getKind() == Opnd::RuntimeInfo::Kind_MethodDirectAddr ) {
                         md = (MethodDesc*)ri->getValue(0);
@@ -651,11 +651,11 @@
 
                     bb->prependInst(movInst,inst);
 
-                    uint8* blockStartIp = (uint8*)bb->getCodeStartAddr();
+                    U_8* blockStartIp = (U_8*)bb->getCodeStartAddr();
                     // 10 bytes are dumped with 'nops' ahead of the call especially for this MOV
-                    uint8* movAddr = instCodeStartAddr-10;
+                    U_8* movAddr = instCodeStartAddr-10;
                     movInst->setCodeOffset((U_32)(movAddr - blockStartIp));
-                    uint8* callAddr = movInst->emit(movAddr);
+                    U_8* callAddr = movInst->emit(movAddr);
                     assert(callAddr == instCodeStartAddr);
                     // then dump 2 bytes with nops to keep return ip the same for both
                     // immediate and register calls

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.cpp Tue May 27 07:05:55 2008
@@ -204,7 +204,7 @@
 }
 
 //_________________________________________________________________________________________________
-uint8* Encoder::emit(uint8* stream, const Inst * inst)
+U_8* Encoder::emit(U_8* stream, const Inst * inst)
 {
     Mnemonic mnemonic=inst->getMnemonic();
     #define OPND EncoderBase::Operand
@@ -229,7 +229,7 @@
             {
                 RegName segReg = p->getSegReg();
                 if (segReg == RegName_FS) {
-                    stream = (uint8*)EncoderBase::prefix((char*)stream,
+                    stream = (U_8*)EncoderBase::prefix((char*)stream,
                                                          InstPrefix_FS);
                 }
 
@@ -268,7 +268,7 @@
                 // emitted alter, rather that to the hidden MOV inserted above
                 InstPrefix instPrefix = getInstPrefixFromSReg(p->getSegReg());
                 if (instPrefix != InstPrefix_Null) {
-                    stream = (uint8*)EncoderBase::prefix((char*)stream, instPrefix);
+                    stream = (U_8*)EncoderBase::prefix((char*)stream, instPrefix);
                 }
             }
             break;
@@ -288,9 +288,9 @@
 
     //emit inst prefix
     if (inst->getPrefix()!=InstPrefix_Null) {
-        stream = (uint8*)EncoderBase::prefix((char*)stream, inst->getPrefix());
+        stream = (U_8*)EncoderBase::prefix((char*)stream, inst->getPrefix());
     }
-    return (uint8*)EncoderBase::encode((char*)stream, mnemonic, args);
+    return (U_8*)EncoderBase::encode((char*)stream, mnemonic, args);
 }
 
 static Mutex opcodeGroupsLock;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Encoder.h Tue May 27 07:05:55 2008
@@ -80,7 +80,7 @@
     /**
      * Inserts the executable bytes into the byte stream.
      */
-    static uint8 * emit(uint8* stream, const Inst * inst);
+    static U_8 * emit(U_8* stream, const Inst * inst);
     /** 
      * struct MemOpndConstraints represents an element of an array of
      * special memory operands. This array is referenced by the Constraint.getMemoryConstraintIndex()

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp Tue May 27 07:05:55 2008
@@ -395,7 +395,7 @@
     m_assert (!(p<(const void*)0x10000)); //(INVALID PTR)
     m_assert((((POINTER_SIZE_INT)p)&0x3)==0); // check for valid alignment
     POINTER_SIZE_INT vtableOffset = VMInterface::getVTableOffset();
-    void * allocationHandle=*(void**)(((uint8*)p)+vtableOffset);
+    void * allocationHandle=*(void**)(((U_8*)p)+vtableOffset);
     m_assert (!(allocationHandle<(void*)0x10000 || (((POINTER_SIZE_INT)allocationHandle)&0x3)!=0)); //INVALID VTABLE PTR
     ObjectType * type=tm.getObjectTypeFromAllocationHandle(allocationHandle);
     m_assert(type!=NULL); // UNRECOGNIZED VTABLE PTR;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.cpp Tue May 27 07:05:55 2008
@@ -204,7 +204,7 @@
 void* Inst::operator new(size_t sz, MemoryManager& mm, U_32 opndCount)
 {   
     Inst * p = (Inst*)mm.alloc(sz + Inst::getOpndChunkSize(opndCount)); 
-    p->allocatedOpndCount = opndCount; p->opnds = (Opnd**)((uint8*)p + sz);
+    p->allocatedOpndCount = opndCount; p->opnds = (Opnd**)((U_8*)p + sz);
     return p; 
 }
 
@@ -425,9 +425,9 @@
 }
 
 //_________________________________________________________________________________________________
-uint8* Inst::emit(uint8* stream)
+U_8* Inst::emit(U_8* stream)
 {
-    uint8 * instEnd = stream;
+    U_8 * instEnd = stream;
     if (!hasKind(Inst::Kind_PseudoInst)){
         assert(mnemonic!=Mnemonic_Null);
         assert(form==Form_Native);
@@ -587,7 +587,7 @@
         return (void*)(POINTER_SIZE_INT)0xDEADBEEF;
     }
     BasicBlock* bb = getBasicBlock();
-    return bb!=NULL?(uint8*)bb->getCodeStartAddr()+codeOffset:0;
+    return bb!=NULL?(U_8*)bb->getCodeStartAddr()+codeOffset:0;
 }
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Inst.h Tue May 27 07:05:55 2008
@@ -775,7 +775,7 @@
     virtual void verify() const { assert(node!=NULL);}
 
     /** Emits (encodes) the instruction into stream */
-    uint8 * emit(uint8* stream);
+    U_8 * emit(U_8* stream);
 
     void initFindInfo(Encoder::FindInfo& fi, Opnd::ConstraintKind opndConstraintKind)const;
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp Tue May 27 07:05:55 2008
@@ -198,9 +198,9 @@
     return jitrino_ieee754_fmod_double(v0,v1);
 } 
 
-void __stdcall initialize_array(uint8* array, U_32 elems_offset, uint8* data, U_32 num_elems) stdcall__;
-void __stdcall initialize_array(uint8* array, U_32 elems_offset, uint8* data, U_32 num_elems) {
-    uint8* array_data = array + elems_offset;
+void __stdcall initialize_array(U_8* array, U_32 elems_offset, U_8* data, U_32 num_elems) stdcall__;
+void __stdcall initialize_array(U_8* array, U_32 elems_offset, U_8* data, U_32 num_elems) {
+    U_8* array_data = array + elems_offset;
     for (U_32 i = 0; i < num_elems; i++) {
         array_data[i] = data[i];
     }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalTrace.cpp Tue May 27 07:05:55 2008
@@ -70,7 +70,7 @@
     for (U_32 i=0; i<argInfoCount; i++){
         CallingConvention::OpndInfo & info=argInfos[i];
         U_32 cb=0;
-        uint8 arg[4*sizeof(U_32)]; 
+        U_8 arg[4*sizeof(U_32)]; 
         for (U_32 j=0; j<info.slotCount; j++){
             if (!info.isReg){
 #ifdef _EM64T_

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp Tue May 27 07:05:55 2008
@@ -1411,7 +1411,7 @@
     for (U_32 i=0; i<opndCount; i++){
         CallingConvention::OpndInfo & info=infos[i];
         U_32 cb=0;
-        uint8 arg[4*sizeof(U_32)]; 
+        U_8 arg[4*sizeof(U_32)]; 
         for (U_32 j=0; j<info.slotCount; j++){
             if (!info.isReg){
 #ifdef _EM64T_
@@ -1441,13 +1441,13 @@
         os<<" ";
         switch (typeTag){
             case Type::Int8:
-                os<<*(int8*)p;
+                os<<*(I_8*)p;
                 break;
             case Type::UInt8:
-                os<<*(uint8*)p;
+                os<<*(U_8*)p;
                 break;
             case Type::Boolean:
-                os<<(*(int8*)p?true:false);
+                os<<(*(I_8*)p?true:false);
                 break;
             case Type::Int16:   
                 os<<*(int16*)p;
@@ -1505,7 +1505,7 @@
     POINTER_SIZE_INT vtableOffset = VMInterface::getVTableOffset();
 
     //  assume that vtable pointer in object head is allocation handle 
-    void * allocationHandle=*(void**)(((uint8*)p)+vtableOffset);
+    void * allocationHandle=*(void**)(((U_8*)p)+vtableOffset);
         
     if (allocationHandle<(void*)0x10000||allocationHandle>(void*)0x20000000||(((POINTER_SIZE_INT)allocationHandle)&0x3)!=0){
         os<<"(INVALID VTABLE PTR: "<<allocationHandle<<")";
@@ -1528,11 +1528,11 @@
 {
     ArrayType * arrayType=(ArrayType *)type;
     U_32 lengthOffset=arrayType->getArrayLengthOffset();
-    U_32 length=*(U_32*)(((uint8*)p)+lengthOffset);
+    U_32 length=*(U_32*)(((U_8*)p)+lengthOffset);
     os<<"{"<<length<<" elems: ";
     if (length>0){
         U_32 elemOffset=arrayType->getArrayElemOffset();
-        printRuntimeOpnd(os, tm, arrayType->getElementType()->tag, (const void*)(((uint8*)p)+elemOffset));
+        printRuntimeOpnd(os, tm, arrayType->getElementType()->tag, (const void*)(((U_8*)p)+elemOffset));
         if (length>1)
             os<<", ...";
     }
@@ -1552,11 +1552,11 @@
     U_32 bufferLengthOffset=8;
     U_32 bufferElemsOffset=12;
     
-    uint8 * string=(uint8*)p;
+    U_8 * string=(U_8*)p;
 
     U_32  stringLength=*(U_32*)(string+stringLengthOffset);
     U_32  stringOffset=*(U_32*)(string+stringOffsetOffset);
-    uint8 * buffer=*(uint8**)(string+stringBufferOffset);
+    U_8 * buffer=*(U_8**)(string+stringBufferOffset);
 
     if (buffer==NULL){
         if (stringLength==0)

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RCE.cpp Tue May 27 07:05:55 2008
@@ -48,7 +48,7 @@
  *      I29: t50.:I_32 (ID:v15(EFLGS):U_32) =AND .t28:I_32,t49(1):I_32 
  *      I30: (AD:v1:I_32) =CopyPseudoInst (AU:t48:I_32) 
  *      I31: (AD:v2:I_32) =CopyPseudoInst (AU:t25:I_32) 
- *      I32: (AD:v3:int8[]) =CopyPseudoInst (AU:t38:int8[]) 
+ *      I32: (AD:v3:I_8[]) =CopyPseudoInst (AU:t38:I_8[]) 
  *      I33: (ID:v15(EFLGS):U_32) =CMP .t50:I_32,t51(0):I_32 
  *      I34: JNZ BB_12 t52(0):intptr (IU:v15(EFLGS):U_32) 
  *
@@ -56,7 +56,7 @@
  *      I29: t50:I_32 (ID:v15(EFLGS):U_32) =AND .t28:I_32,t49(1):I_32 
  *      I30: (AD:v1:I_32) =CopyPseudoInst (AU:t48:I_32) 
  *      I31: (AD:v2:I_32) =CopyPseudoInst (AU:t25:I_32) 
- *      I32: (AD:v3:int8[]) =CopyPseudoInst (AU:t38:int8[]) 
+ *      I32: (AD:v3:I_8[]) =CopyPseudoInst (AU:t38:I_8[]) 
  *      I34: JNZ BB_12 t52(0):intptr (IU:v15(EFLGS):U_32) 
  *
  *  The implementation of this transformer is located in Ia32RCE.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.h Tue May 27 07:05:55 2008
@@ -47,7 +47,7 @@
 
 
 /**
- * Same as 3-args method, but presumes type for the TLS base as int8*.
+ * Same as 3-args method, but presumes type for the TLS base as I_8*.
  */
 Opnd* createTlsBaseLoadSequence(IRManager& irManager, Node* ctrlNode);
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/dynopt/StaticProfiler.cpp Tue May 27 07:05:55 2008
@@ -523,7 +523,7 @@
                 constValLEzero = val.i4 <= 0;
 #endif
                 break;
-            case Type::Int8:  constValLEzero = ((int8)val.i4) <= 0; break;
+            case Type::Int8:  constValLEzero = ((I_8)val.i4) <= 0; break;
             case Type::Int16: constValLEzero = ((int16)val.i4) <= 0; break;
             case Type::Int32: constValLEzero = val.i4 <= 0; break;
             case Type::Int64: constValLEzero = val.i8 <= 0; break;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h Tue May 27 07:05:55 2008
@@ -955,7 +955,7 @@
      */
     void lea(const Opnd& reg, const Opnd& mem);
     /**
-     * Generates sign extension of int8 from op1 into op0.
+     * Generates sign extension of I_8 from op1 into op0.
      */
     void sx1(const Opnd& op0, const Opnd& op1);
     /**
@@ -967,7 +967,7 @@
      */
     void sx(const Opnd& op0, const Opnd& op1);
     /**
-     * Generates zero extension of uint8 from op1 into op0.
+     * Generates zero extension of U_8 from op1 into op0.
      */
     void zx1(const Opnd& op0, const Opnd& op1);
     /**

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.cpp Tue May 27 07:05:55 2008
@@ -247,7 +247,7 @@
 // Utilities for constant folding
 //-----------------------------------------------------------------------------
 bool
-ConstantFolder::fold8(Opcode opc, int8 c1, int8 c2, I_32& result, bool is_signed) {
+ConstantFolder::fold8(Opcode opc, I_8 c1, I_8 c2, I_32& result, bool is_signed) {
     switch (opc) {
     case Op_Add:    result = c1 + c2; return true;
     case Op_Sub:    result = c1 - c2; return true;
@@ -259,25 +259,25 @@
         if (is_signed) {
             result = c1 * c2; return true;
         } else {
-            result = CAST(I_32, CAST(U_32, (CAST(uint8, c1)*CAST(uint8, c2)))); return true;
+            result = CAST(I_32, CAST(U_32, (CAST(U_8, c1)*CAST(U_8, c2)))); return true;
         }
     // for div and rem, be careful c2 not be 0
     // also, need to handle signed/unsigned based on SignedModifier
     case Op_TauDiv:    
-        if (c2 == (int8)0) return false;
+        if (c2 == (I_8)0) return false;
         if (is_signed) {
             result = c1 / c2; return true;
         } else {
-            result = CAST(I_32, CAST(U_32, CAST(uint8, c1) / CAST(uint8, c2))); return true;
+            result = CAST(I_32, CAST(U_32, CAST(U_8, c1) / CAST(U_8, c2))); return true;
         }
     case Op_TauRem:
-        if (c2 == (int8)0) return false;
+        if (c2 == (I_8)0) return false;
         if (is_signed) {
             result = c1 % c2; return true;
         } else {
-            result = CAST(I_32, CAST(U_32, CAST(uint8, c1) % CAST(uint8, c2))); return true;
+            result = CAST(I_32, CAST(U_32, CAST(U_8, c1) % CAST(U_8, c2))); return true;
         }
-    case Op_MulHi:  result = (I_32)(int8)((((int16)c1) * ((int16)c2)) >> 8);
+    case Op_MulHi:  result = (I_32)(I_8)((((int16)c1) * ((int16)c2)) >> 8);
         return true;
     case Op_Min:
         result = ::std::min(c1,c2); return true;
@@ -481,7 +481,7 @@
 }
 
 bool
-ConstantFolder::fold8(Opcode opc, int8 c, I_32& result) {
+ConstantFolder::fold8(Opcode opc, I_8 c, I_32& result) {
     switch (opc) {
     case Op_Not:    result = ~c; return true;
     case Op_Neg:    result = -c; return true;
@@ -889,7 +889,7 @@
     
     switch (type) {
     case Type::Int8:
-    case Type::UInt8:  return fold8(opc, (int8)val1.i4, (int8)val2.i4, result.i4, is_signed);
+    case Type::UInt8:  return fold8(opc, (I_8)val1.i4, (I_8)val2.i4, result.i4, is_signed);
     case Type::Int16:
     case Type::UInt16: return fold16(opc, (int16)val1.i4, (int16)val2.i4, result.i4, is_signed);
     case Type::Int32:   
@@ -900,7 +900,7 @@
     case Type::UIntPtr: {
         int psi = sizeof(POINTER_SIZE_INT);
         switch (psi) {
-        case 1: return fold8(opc, (int8)val1.i4, (int8)val2.i4, result.i4, is_signed);
+        case 1: return fold8(opc, (I_8)val1.i4, (I_8)val2.i4, result.i4, is_signed);
         case 2: return fold16(opc, (int16)val1.i4, (int16)val2.i4, result.i4, is_signed);
         case 4: return fold32(opc, val1.i4, val2.i4, result.i4, is_signed);
         case 8: return fold64(opc, val1.i8, val2.i8, result.i8, is_signed);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/constantfolder.h Tue May 27 07:05:55 2008
@@ -49,7 +49,7 @@
     //
     // binary arithmetic/logical operations
     //
-    static bool fold8(Opcode,  int8 c1,  int8 c2,  I_32& result, bool is_signed);
+    static bool fold8(Opcode,  I_8 c1,  I_8 c2,  I_32& result, bool is_signed);
     static bool fold16(Opcode, int16 c1, int16 c2, I_32& result, bool is_signed);
     static bool fold32(Opcode, I_32 c1, I_32 c2, I_32& result, bool is_signed);
     static bool fold64(Opcode, int64 c1, int64 c2, int64& result, bool is_signed);
@@ -58,7 +58,7 @@
     // 
     // unary arithmetic/logical operations
     //
-    static bool fold8(Opcode opc,  int8 c,  I_32& result);
+    static bool fold8(Opcode opc,  I_8 c,  I_32& result);
     static bool fold16(Opcode opc, int16 c, I_32& result);
     static bool fold32(Opcode opc, I_32 c, I_32& result);
     static bool fold64(Opcode opc, int64 c, int64& result);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp Tue May 27 07:05:55 2008
@@ -121,7 +121,7 @@
     }
 }
 
-static uint8
+static U_8
 getBitWidth(Type::Tag tag)
 {
     switch (tag) {
@@ -143,12 +143,12 @@
 
 // returns the number of bits of the given opnd_num which is used,
 // given that dst_bits of the dst are used
-static uint8
-usesBitsOfOpnd(uint8 dst_bits, Inst* inst, U_32 opnd_num) {
-    uint8 opwidth = getBitWidth(inst->getType());
+static U_8
+usesBitsOfOpnd(U_8 dst_bits, Inst* inst, U_32 opnd_num) {
+    U_8 opwidth = getBitWidth(inst->getType());
     Opnd *opnd = inst->getSrc(opnd_num);
-    uint8 opndwidth = getBitWidth(opnd->getType()->tag);
-    uint8 res = opndwidth;
+    U_8 opndwidth = getBitWidth(opnd->getType()->tag);
+    U_8 res = opndwidth;
     switch (inst->getOpcode()) {
     case Op_Add:   case Op_Mul:    case Op_Sub:
         res = ::std::min(dst_bits, opwidth); break;
@@ -178,7 +178,7 @@
                         ConstantFolder::isConstant(shiftAmount->getInst(), 
                                                    shiftby);
                     if( !(isconst && (shiftby > 0)) ) assert(0);
-                    res = ::std::min(dst_bits, opwidth)-(uint8)shiftby;
+                    res = ::std::min(dst_bits, opwidth)-(U_8)shiftby;
                     break;
                 }
             case 1:
@@ -207,7 +207,7 @@
                         = ConstantFolder::isConstant(shiftAmount->getInst(), 
                                                      shiftby);
                     if (isconst && shiftby > 0) {
-                        res = ::std::min(dst_bits, opwidth)-(uint8)shiftby;
+                        res = ::std::min(dst_bits, opwidth)-(U_8)shiftby;
                         break;
                     }
                 }
@@ -265,7 +265,7 @@
             res = opndwidth;
         }
     }
-    uint8 res1 = ::std::min(res, opndwidth);
+    U_8 res1 = ::std::min(res, opndwidth);
     return res1;
 }
 
@@ -394,7 +394,7 @@
     assert(inst);
     assert(inst->getNode());
 
-    uint8 dstWidth = 255;
+    U_8 dstWidth = 255;
 
     if (Log::isEnabled()) {
         Log::out() << "Found dstwidth of " << (int) dstWidth
@@ -415,12 +415,12 @@
             assert(def != NULL);
 
             assert(def->getNode());
-            uint8 opndWidth = 255;
+            U_8 opndWidth = 255;
             U_32 defId = def->getId();
 
             if (usefulInstSet.setBit(defId-minInstId, true)) {
                 // was already marked as live, check old width.
-                uint8 oldOpndWidth = 255;
+                U_8 oldOpndWidth = 255;
 
                 if (Log::isEnabled()) {
                     Log::out() << "Found dstwidth of " << (int) oldOpndWidth
@@ -553,7 +553,7 @@
              InstDeque& workSet,
              BitSet& usefulInstSet,
              BitSet& usefulVarSet,
-             uint8 *usedInstWidth,
+             U_8 *usedInstWidth,
              U_32 minInstId,
              U_32 maxInstId) {
     //
@@ -564,7 +564,7 @@
     U_32 instId = inst->getId();
     assert(usedInstWidth);
     assert((instId >= minInstId) && (instId < maxInstId));
-    uint8 dstWidth = usedInstWidth[instId-minInstId];
+    U_8 dstWidth = usedInstWidth[instId-minInstId];
 
     if (Log::isEnabled()) {
         Log::out() << "Found dstwidth of " << (int) dstWidth
@@ -584,7 +584,7 @@
                 continue;
             assert(def != NULL);
 
-            uint8 opndWidth = usesBitsOfOpnd(dstWidth, inst, i);
+            U_8 opndWidth = usesBitsOfOpnd(dstWidth, inst, i);
             assert(def);
             assert(def->getNode());
             U_32 defId = def->getId();
@@ -599,7 +599,7 @@
                 }
             } else if (usefulInstSet.setBit(defId-minInstId, true)) {
                 // was already marked as live, check old width.
-                uint8 oldOpndWidth = usedInstWidth[defId-minInstId];
+                U_8 oldOpndWidth = usedInstWidth[defId-minInstId];
 
                 if (Log::isEnabled()) {
                     Log::out() << "Found dstwidth of " << (int) oldOpndWidth
@@ -653,7 +653,7 @@
                               Inst* inst,
                               BitSet& usefulInstSet,
                               BitSet& usefulVarSet,
-                              uint8 *usedInstWidth,
+                              U_8 *usedInstWidth,
                               U_32 minInstId,
                               U_32 maxInstId,
                               bool canRemoveStvars) {
@@ -719,9 +719,9 @@
                 if (!srcType->isInteger())
                     break;
         
-                uint8 convSize = getBitWidth(instType);
-                uint8 srcSize = getBitWidth(srcType->tag);
-                uint8 dstSize = getBitWidth(inst->getDst()->getType()->tag);
+                U_8 convSize = getBitWidth(instType);
+                U_8 srcSize = getBitWidth(srcType->tag);
+                U_8 dstSize = getBitWidth(inst->getDst()->getType()->tag);
 
                 if (dstSize != srcSize) {
                     // it's not just a sign-extension, we can't remove it
@@ -729,7 +729,7 @@
                 }
 
                 assert((minInstId <= instId) && (instId < maxInstId));
-                uint8 usedDstSize = usedInstWidth[instId-minInstId];
+                U_8 usedDstSize = usedInstWidth[instId-minInstId];
 
                 if (Log::isEnabled()) {
                     Log::out() << "Found dstwidth of " << (int) usedDstSize
@@ -888,7 +888,7 @@
     BitSet usefulInstSet(memManager,numInsts+1);
     BitSet usefulVarSet(memManager,numOpnds+1);
     const OptimizerFlags& optimizerFlags = irManager.getOptimizerFlags();
-    uint8 *usedInstWidth = optimizerFlags.dce2 ? new (memManager) uint8[numInsts] : 0;
+    U_8 *usedInstWidth = optimizerFlags.dce2 ? new (memManager) U_8[numInsts] : 0;
 
     {
         AutoTimer t(dcePhase1Timer); 
@@ -917,7 +917,7 @@
                     U_32 instId = inst->getId();
                     usefulInstSet.setBit(instId-minInstId, true);
                     if (usedInstWidth) {
-                        uint8 usedWidth = getBitWidth(inst->getType());
+                        U_8 usedWidth = getBitWidth(inst->getType());
                         if (Log::isEnabled()) {
                             Log::out() << "Setting dstwidth to " << (int) usedWidth
                                        << " for inst ";

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.h Tue May 27 07:05:55 2008
@@ -65,7 +65,7 @@
     static void fixInfiniteLoops(IRManager& irm, const InfiniteLoopsInfo& info);
 
 private:
-    void sweepInst(Node* node, Inst* inst, BitSet& usefulInstSet, BitSet& usefulVarSet, uint8 *usedInstWidth, U_32 minInstId, U_32 maxInstId, bool canRemoveStvars);
+    void sweepInst(Node* node, Inst* inst, BitSet& usefulInstSet, BitSet& usefulVarSet, U_8 *usedInstWidth, U_32 minInstId, U_32 maxInstId, bool canRemoveStvars);
     void sweepInst1(Node* node, Inst* inst, BitSet& usefulInstSet, BitSet& usefulVarSet,
                     U_32 minInstId, U_32 maxInstId, bool canRemoveStvars); // if we're skipping instWidth
     static Opnd* findDefiningTemp(Opnd* var);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp Tue May 27 07:05:55 2008
@@ -323,7 +323,7 @@
     void lconst(int64)  {}
     void fconst(float)  {}
     void dconst(double)  {}
-    void bipush(int8)  {}
+    void bipush(I_8)  {}
     void sipush(int16)  {}
     void ldc(U_32)  {}
     void ldc2(U_32)  {}
@@ -435,7 +435,7 @@
     void if_acmpne(U_32 targetOffset,U_32 nextOffset)  {}
     void goto_(U_32 targetOffset,U_32 nextOffset)  {}
     void jsr(U_32 offset, U_32 nextOffset)  {}
-    void ret(uint16 varIndex,const uint8* byteCodes)  {}
+    void ret(uint16 varIndex,const U_8* byteCodes)  {}
     void tableswitch(JavaSwitchTargetsIter*)  {}
     void lookupswitch(JavaLookupSwitchTargetsIter*)  {}
     void ireturn(U_32 off)  {}
@@ -453,15 +453,15 @@
     void invokestatic(U_32 constPoolIndex)  { leaf = false; }
     void invokeinterface(U_32 constPoolIndex,U_32 count)  { leaf = false; }
     void new_(U_32 constPoolIndex)  {}
-    void newarray(uint8 type)  {}
+    void newarray(U_8 type)  {}
     void anewarray(U_32 constPoolIndex)  {}
     void arraylength()  {}
     void athrow()  {}
     void checkcast(U_32 constPoolIndex)  {}
-    int  instanceof(const uint8* bcp, U_32 constPoolIndex, U_32 off)  {return 3;}
+    int  instanceof(const U_8* bcp, U_32 constPoolIndex, U_32 off)  {return 3;}
     void monitorenter()  {}
     void monitorexit()  {}
-    void multianewarray(U_32 constPoolIndex,uint8 dimensions)  {}
+    void multianewarray(U_32 constPoolIndex,U_8 dimensions)  {}
     void ifnull(U_32 targetOffset,U_32 nextOffset)  {}
     void ifnonnull(U_32 targetOffset,U_32 nextOffset) {}
 };

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp Tue May 27 07:05:55 2008
@@ -2406,7 +2406,7 @@
     void applyToInst(Inst *inst);
 };
 
-static uint8
+static U_8
 getBitWidth(Type::Tag tag)
 {
     switch (tag) {

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/optarithmetic.h Tue May 27 07:05:55 2008
@@ -273,7 +273,7 @@
 template <> inline uint64 isqrt(uint64 n) { return isqrt_iter(n, (uint64) 65536); }
 template <> inline U_32 isqrt(U_32 n) { return isqrt_iter(n, (U_32) 256); }
 template <> inline uint16 isqrt(uint16 n) { return isqrt_iter(n, (uint16) 16); }
-template <> inline uint8 isqrt(uint8 n) { return isqrt_iter(n, (uint8) 4); }
+template <> inline U_8 isqrt(U_8 n) { return isqrt_iter(n, (U_8) 4); }
 
 } //namespace Jitrino 
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryAttribute.h Tue May 27 07:05:55 2008
@@ -223,7 +223,7 @@
         };
     private:
         Context(Tag t, U_32 _size = 0)
-            : tag(t), size((uint8)_size) {
+            : tag(t), size((U_8)_size) {
             id.all = UnknownMemoryContextId;
             assert(_size <= 0xff);
         }
@@ -231,7 +231,7 @@
             if (id.all != id1)
                 id.all = UnknownMemoryContextId;
         }
-        void unionSizes(uint8 size1) {
+        void unionSizes(U_8 size1) {
             if (size < size1)
                 size = size1;
         }
@@ -253,7 +253,7 @@
             U_32       counterId;
             uint64       all;
         } id;
-        uint8    size; // size of accessed memory in bytes; used for stack locations
+        U_8    size; // size of accessed memory in bytes; used for stack locations
         static Info info[];
         friend class MemoryAttributeManager;
     };  // end class Context
@@ -321,7 +321,7 @@
     MemoryAttribute::Context getStackContext(U_32 offset, U_32 size) {
         assert(size <= 0xff);
         MemoryAttribute::Context c(MemoryAttribute::Context::StackLocation,
-                                   (uint8)size);
+                                   (U_8)size);
         c.id.stackOffset = offset;
         return c;
     }
@@ -371,7 +371,7 @@
         if (context.tag == MemoryAttribute::Context::StackLocation ||
             context.tag == MemoryAttribute::Context::StackIncomingArg) {
             assert(_size <= 0xff);
-            context.size = (uint8)_size;
+            context.size = (U_8)_size;
             if (context.id.all != UnknownMemoryContextId)
                 context.id.stackOffset += _offset;
         }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp Tue May 27 07:05:55 2008
@@ -903,12 +903,12 @@
     case Boolean:          s = "bool"; break;
     case Char:             s = "char"; break;
     case IntPtr:           s = "intptr"; break;
-    case Int8:             s = "int8"; break;
+    case Int8:             s = "I_8"; break;
     case Int16:            s = "int16"; break;
     case Int32:            s = "I_32"; break;
     case Int64:            s = "int64"; break;
     case UIntPtr:          s = "uintptr"; break;
-    case UInt8:            s = "uint8"; break;
+    case UInt8:            s = "U_8"; break;
     case UInt16:           s = "uint16"; break;
     case UInt32:           s = "U_32"; break;
     case UInt64:           s = "uint64"; break;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h?rev=660520&r1=660519&r2=660520&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/ByteCodeParser.h Tue May 27 07:05:55 2008
@@ -36,7 +36,7 @@
     // parses one byte code starting at given offset,
     // updates nextOffset to point at next byte code,
     // returns false if parsing should stop
-    virtual bool parseByteCode(const uint8* byteCodes,U_32 byteCodeOffset) = 0;
+    virtual bool parseByteCode(const U_8* byteCodes,U_32 byteCodeOffset) = 0;
     // called before the parsing starts
     virtual void parseInit() = 0;
     // called after the parsing ends, but not if an error occurs
@@ -56,7 +56,7 @@
     //
     // creates a new ByteCodeParser
     //
-    ByteCodeParser(const uint8* bc, U_32 length)  {
+    ByteCodeParser(const U_8* bc, U_32 length)  {
         byteCodes = bc;    byteCodeLength = length; byteCodeOffset = 0;
     }
     //
@@ -77,11 +77,11 @@
     }
 
     // Export these values to implement translator optimizations
-    const uint8* getByteCodes() {return byteCodes;}
+    const U_8* getByteCodes() {return byteCodes;}
     U_32 getByteCodeLength()  {return byteCodeLength;}
 
 private:
-    const uint8* byteCodes;
+    const U_8* byteCodes;
     U_32       byteCodeLength;
     U_32       byteCodeOffset;
 };
@@ -95,10 +95,10 @@
 #define readU4Be(bytes) (((U_32)(bytes)[0]<<24) | ((U_32)(bytes)[1]<<16) | \
                          ((U_32)(bytes)[2]<<8)  | (bytes)[3])
 
-inline int8     si8(const uint8* bcp)    {return ((int8*)bcp)[0];}
-inline uint8    su8(const uint8* bcp)    {return bcp[0];}
-inline float    sr4(const uint8* bcp)    {return ((float*)bcp)[0];} 
-inline double   sr8(const uint8* bcp)    {return ((double*)bcp)[0];} 
+inline I_8     si8(const U_8* bcp)    {return ((I_8*)bcp)[0];}
+inline U_8    su8(const U_8* bcp)    {return bcp[0];}
+inline float    sr4(const U_8* bcp)    {return ((float*)bcp)[0];} 
+inline double   sr8(const U_8* bcp)    {return ((double*)bcp)[0];} 
 } //namespace Jitrino 
 
 #endif // _BYTECODEPARSER_H_



Mime
View raw message