harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r659108 [19/19] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/mark_compact/ gc_gen/src/mark_sweep/ gc_gen/src/semi_space/ gc_gen/src/trace_forward/ include/open/ interpreter/src/ jitrino/src/codegenerator/ jit...
Date Thu, 22 May 2008 13:34:09 GMT
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp Thu May 22
06:33:38 2008
@@ -63,7 +63,7 @@
     // Nothing to do on IA32
 }
 
-static uint32* get_arg_word(unsigned num_arg_words, unsigned word) {
+static U_32* get_arg_word(unsigned num_arg_words, unsigned word) {
     return m2n_get_args(m2n_get_last_frame())+num_arg_words-word-1;
 }
 
@@ -151,7 +151,7 @@
 #ifdef REFS_RUNTIME_OR_COMPRESSED
     REFS_RUNTIME_SWITCH_IF
         ss = mov(ss,  eax_opnd,  M_Base_Opnd(esp_reg, stack_pointer_offset));
-        ss = alu(ss, cmp_opc,  eax_opnd,  Imm_Opnd((int32)VM_Global_State::loader_env->heap_base)
);
+        ss = alu(ss, cmp_opc,  eax_opnd,  Imm_Opnd((I_32)VM_Global_State::loader_env->heap_base)
);
         ss = branch8(ss, Condition_NE,  Imm_Opnd(size_8, 0));  // not null, branch around
the mov 0
         char *backpatch_address__not_managed_null = ((char *)ss) - 1;
         ss = mov(ss,  M_Base_Opnd(esp_reg, stack_pointer_offset),  Imm_Opnd(0));
@@ -218,9 +218,9 @@
 #endif
 
 #ifdef VM_STATS
-    stub = inc(stub, M_Base_Opnd(n_reg, (int32)&VM_Statistics::get_vm_stats().num_compileme_used));
+    stub = inc(stub, M_Base_Opnd(n_reg, (I_32)&VM_Statistics::get_vm_stats().num_compileme_used));
 #endif
-    stub = mov(stub, ecx_opnd, Imm_Opnd((int32)method));
+    stub = mov(stub, ecx_opnd, Imm_Opnd((I_32)method));
     stub = jump(stub, (char *)compile_get_compile_me_generic());
     assert(stub - (char *)addr <= STUB_SIZE);
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/ini_iA32.cpp Thu May 22 06:33:38
2008
@@ -39,26 +39,26 @@
 
 #include "dump.h"
 
-typedef ManagedObject* (*RefFuncPtr)(uint32* args, int args_size, void* func);
-typedef int32 (*IntFuncPtr)(uint32* args, int args_size, void* func);
-typedef int64 (*LongFuncPtr)(uint32* args, int args_size, void* func);
-typedef float (*FloatFuncPtr)(uint32* args, int args_size, void* func);
-typedef double (*DoubleFuncPtr)(uint32* args, int args_size, void* func);
+typedef ManagedObject* (*RefFuncPtr)(U_32* args, int args_size, void* func);
+typedef I_32 (*IntFuncPtr)(U_32* args, int args_size, void* func);
+typedef int64 (*LongFuncPtr)(U_32* args, int args_size, void* func);
+typedef float (*FloatFuncPtr)(U_32* args, int args_size, void* func);
+typedef double (*DoubleFuncPtr)(U_32* args, int args_size, void* func);
 
 static char* gen_invoke_common_managed_func(char* stub) {
     // Defines stack alignment on managed function enter.
-    const int32 STACK_ALIGNMENT = MANAGED_STACK_ALIGNMENT;
-    const int32 STACK_ALIGNMENT_MASK = ~(STACK_ALIGNMENT - 1);
+    const I_32 STACK_ALIGNMENT = MANAGED_STACK_ALIGNMENT;
+    const I_32 STACK_ALIGNMENT_MASK = ~(STACK_ALIGNMENT - 1);
     const char * LOOP_BEGIN = "loop_begin";
     const char * LOOP_END = "loop_end";
 
     // [ebp + 8] - args
     // [ebp + 12] - size
     // [ebp + 16] - func
-    const int32 STACK_ARGS_OFFSET = 8;
-    const int32 STACK_NARGS_OFFSET = 12;
-    const int32 STACK_FUNC_OFFSET = 16;
-    const int32 STACK_CALLEE_SAVED_OFFSET = -12;
+    const I_32 STACK_ARGS_OFFSET = 8;
+    const I_32 STACK_NARGS_OFFSET = 12;
+    const I_32 STACK_FUNC_OFFSET = 16;
+    const I_32 STACK_CALLEE_SAVED_OFFSET = -12;
     
     tl::MemoryPool pool;
     LilCguLabelAddresses labels(&pool, stub);
@@ -216,7 +216,7 @@
             << method->get_descriptor()->bytes);
     int sz = method->get_num_arg_slots();
     void *meth_addr = method->get_code_addr();
-    uint32 *arg_words = (uint32*) STD_ALLOCA(sz * sizeof(uint32));
+    U_32 *arg_words = (U_32*) STD_ALLOCA(sz * sizeof(U_32));
 
     int argId = sz;
     int pos = 0;
@@ -247,26 +247,26 @@
 
             case JAVA_TYPE_SHORT:
                 // sign extend
-                arg_words[--argId] = (uint32)(int32) args[pos++].s;
+                arg_words[--argId] = (U_32)(I_32) args[pos++].s;
                 break;
             case JAVA_TYPE_BYTE:
                 // sign extend
-                arg_words[--argId] = (uint32)(int32) args[pos++].b;
+                arg_words[--argId] = (U_32)(I_32) args[pos++].b;
                 break;
             case JAVA_TYPE_INT:
                 // sign extend
-                arg_words[--argId] = (uint32)(int32) args[pos++].i;
+                arg_words[--argId] = (U_32)(I_32) args[pos++].i;
                 break;
 
             case JAVA_TYPE_FLOAT:
-                arg_words[--argId] = (int32) args[pos++].i;
+                arg_words[--argId] = (I_32) args[pos++].i;
                 break;
             case JAVA_TYPE_BOOLEAN:
-                arg_words[--argId] = (int32) args[pos++].z;
+                arg_words[--argId] = (I_32) args[pos++].z;
                 break;
             case JAVA_TYPE_CHAR:
                 // zero extend
-                arg_words[--argId] = (int32) args[pos++].c;
+                arg_words[--argId] = (I_32) args[pos++].c;
                 break;
 
             case JAVA_TYPE_LONG:

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
Thu May 22 06:33:38 2008
@@ -320,7 +320,7 @@
     *ss++ = (char)0x00;
     *ss++ = (char)0x00;
     *ss++ = (char)0x00;
-    ss = alu(ss, add_opc,  eax_opnd,  Imm_Opnd((uint32)&((VM_thread *)0)->_gc_private_information));
+    ss = alu(ss, add_opc,  eax_opnd,  Imm_Opnd((U_32)&((VM_thread *)0)->_gc_private_information));
 #endif // !PLATFORM_POSIX
 */
     ss = push(ss,  eax_opnd);
@@ -351,7 +351,7 @@
     *ss++ = (char)0x00;
     *ss++ = (char)0x00;
     *ss++ = (char)0x00;
-    ss = alu(ss, add_opc,  eax_opnd,  Imm_Opnd((uint32)&((VM_thread *)0)->_gc_private_information));
+    ss = alu(ss, add_opc,  eax_opnd,  Imm_Opnd((U_32)&((VM_thread *)0)->_gc_private_information));
 #endif // !PLATFORM_POSIX
 */  
     ss = push(ss,  eax_opnd);
@@ -672,7 +672,7 @@
     Class* c = (Class*)p_args[0];
     unsigned dims = p_args[1];
     assert(dims<=max_dim);
-    uint32* lens_base = (uint32*)(p_args+2);
+    U_32* lens_base = (U_32*)(p_args+2);
     for(unsigned i = 0; i < dims; i++) {
         lens[i] = lens_base[dims-i-1];
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp Thu May 22 06:33:38
2008
@@ -270,7 +270,7 @@
         return_value->j = int_result;
         break;
     case JAVA_TYPE_INT:
-        *((int32 *)return_value) = (int32) int_result;
+        *((I_32 *)return_value) = (I_32) int_result;
         break;
     case JAVA_TYPE_SHORT:
         *((int16 *)return_value) = (int16) int_result;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Thu
May 22 06:33:38 2008
@@ -1470,7 +1470,7 @@
 
     int out0, save_pfs, save_b0, save_gp;
     const int num_in_args = 5, num_out_args = 5;
-    ArrayCopyResult (*p_array_copy)(ManagedObject* src, int32 src_off, ManagedObject* dst,
int32 dst_off, int32 count);
+    ArrayCopyResult (*p_array_copy)(ManagedObject* src, I_32 src_off, ManagedObject* dst,
I_32 dst_off, I_32 count);
     p_array_copy = array_copy;
     emit_alloc_for_single_call(emitter, num_in_args, num_out_args,
         (void **)p_array_copy,

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp Thu May 22
06:33:38 2008
@@ -190,7 +190,7 @@
 {
     assert(VM_Global_State::loader_env->compress_references);
     const bool cmp4 = true;
-    uint32 null_low = (uint32) (uint64) VM_Global_State::loader_env->managed_null;
+    U_32 null_low = (U_32) (uint64) VM_Global_State::loader_env->managed_null;
     if (null_low == 0)
     {
         emitter.ipf_cmp(icmp_eq, cmp_none, predicate1, predicate2, src, 0, cmp4);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h Thu May 22 06:33:38
2008
@@ -35,7 +35,7 @@
 class IPF_Encoder : public Merced_Encoder {
   public:
     IPF_Encoder() : Merced_Encoder(0) {
-        assert(*(uint32*)"JIT1"==0x3154494A);
+        assert(*(U_32*)"JIT1"==0x3154494A);
         // assure little-endian because get_slot01_code_image() needs it
     }
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h Thu May
22 06:33:38 2008
@@ -101,7 +101,7 @@
 // only the lower 32 bits of the register need to be checked,
 // and that the lower 32 bits are usually 0.
 // The semantics are:
-//   cmp4.eq  p1,p2=src,(uint32)managed_null
+//   cmp4.eq  p1,p2=src,(U_32)managed_null
 void gen_compare_to_managed_null(Merced_Code_Emitter &emitter,
                                  int predicate1, int predicate2, // predicate regs to set
                                  int src, // register to compare against

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp Thu May 22 06:33:38 2008
@@ -218,8 +218,8 @@
     assert(f_value_offset);
 
     U_8* str_raw = (U_8*)str;
-    *(uint32*)(str_raw+f_count_offset) = length;
-    *(uint32*)(str_raw+f_offset_offset) = offset;
+    *(U_32*)(str_raw+f_count_offset) = length;
+    *(U_32*)(str_raw+f_offset_offset) = offset;
     STORE_REFERENCE(str, str_raw+f_value_offset, chars);
 }
 
@@ -369,7 +369,7 @@
 
     if (f_count_offset == 0) init_fields();
     U_8* str_raw = (U_8*)str;
-    return *(uint32*)(str_raw+f_count_offset);
+    return *(U_32*)(str_raw+f_count_offset);
 }
 
 // returns length in characters
@@ -416,7 +416,7 @@
     assert(f_value_char_offset);
 
     U_8* str_raw = (U_8*)str;
-    unsigned offset = *(uint32*)(str_raw + f_offset_offset);
+    unsigned offset = *(U_32*)(str_raw + f_offset_offset);
     Vector_Handle char_array = get_raw_reference_pointer((ManagedObject**)(str_raw+f_value_char_offset));
     if (char_array) {
         buf->is_compressed = false;
@@ -434,7 +434,7 @@
 const uint16* string_get_unicode_chars(ManagedObject* string)
 {
     assert(string);
-    uint32 unicode_size = string_get_length(string);
+    U_32 unicode_size = string_get_length(string);
     StringBuffer buf;
     string_get_buffer(string, &buf);
     uint16* unicode_chars = (uint16*)STD_MALLOC(sizeof(uint16)*(unicode_size+1));
@@ -457,7 +457,7 @@
 const char* string_get_utf8_chars(ManagedObject* string)
 {
     assert(string);
-    uint32 unicode_size = string_get_length(string);
+    U_32 unicode_size = string_get_length(string);
     StringBuffer buf;
     string_get_buffer(string, &buf);
     char* utf_chars;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ipf/nt_exception_filter.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ipf/nt_exception_filter.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ipf/nt_exception_filter.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ipf/nt_exception_filter.cpp Thu May
22 06:33:38 2008
@@ -74,7 +74,7 @@
     regs->gr[ 30]   = (uint64)(pcontext->IntT21);
     regs->gr[ 31]   = (uint64)(pcontext->IntT22);
 
-    uint32 gr_cursor = 32;
+    U_32 gr_cursor = 32;
     uint64 *bsp_cursor = regs->bsp;
 
     while (gr_cursor<128) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.h Thu May 22
06:33:38 2008
@@ -209,7 +209,7 @@
     }
 
     //read four-byte value
-    static uint32 read_uint32(U_8* ptr) {
+    static U_32 read_uint32(U_8* ptr) {
         return (ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | ptr[3];
     }
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver_utils.h Thu May 22 06:33:38
2008
@@ -402,7 +402,7 @@
         int idx = 0;
 
         for( ; idx < length - 3; idx += 4 ) {
-            if( *((uint32*) (key+idx) ) != *((uint32*) (h_key+idx) ) ) return false;
+            if( *((U_32*) (key+idx) ) != *((U_32*) (h_key+idx) ) ) return false;
         }
 
         for( ; idx < length; idx++) {
@@ -423,7 +423,7 @@
         int idx = 0;
 
         for( ; idx < length - 3; idx += 4 ) {
-            result += *((uint32*) (key+idx) );
+            result += *((U_32*) (key+idx) );
         }
 
         for( ; idx < length; idx++) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.cpp Thu May 22
06:33:38 2008
@@ -205,7 +205,7 @@
 
     read_ptr+=2; //skip uint16 attribute_name_index
 
-    uint32 attribute_length = read_uint32(read_ptr); 
+    U_32 attribute_length = read_uint32(read_ptr); 
     read_ptr+=4;
     U_8* attribute_end = stackmaptable + attribute_length + 6;
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/recompute.h Thu May
22 06:33:38 2008
@@ -205,7 +205,7 @@
     void writeStackMapFrame_Same(Address offset);
     void writeStackMapFrame_Cut(Address offset, int attr_delta, int workmap_delta);
     void writeStackMapFrame_Append(Address offset, int attr_delta, int workmap_delta);
-    void writeStackMapElements(Address start, uint32 cnt);
+    void writeStackMapElements(Address start, U_32 cnt);
 
     void writeByte(uint16 byte) {
         assert(byte < 256);
@@ -444,8 +444,8 @@
     void* unparsedPairs;
 
 
-    uint32 attrLen;
-    uint32 attrSz;
+    U_32 attrLen;
+    U_32 attrSz;
 };
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp?rev=659108&r1=659107&r2=659108&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/x_verifier/write_attr.cpp Thu
May 22 06:33:38 2008
@@ -197,7 +197,7 @@
     lastLocalsNo += app_realsz;
 }
 
-void vf_Context_5e::writeStackMapElements( Address start, uint32 cnt ) {
+void vf_Context_5e::writeStackMapElements( Address start, U_32 cnt ) {
     while( cnt ) {
         SmConstant el = curFrame->elements[start].const_val;
         workmap->elements[start].const_val = el;



Mime
View raw message