Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 61969 invoked from network); 20 May 2008 18:38:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 May 2008 18:38:52 -0000 Received: (qmail 262 invoked by uid 500); 20 May 2008 18:38:53 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 240 invoked by uid 500); 20 May 2008 18:38:53 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 231 invoked by uid 99); 20 May 2008 18:38:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 11:38:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 18:38:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D6FC623889FF; Tue, 20 May 2008 11:38:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r658384 [1/2] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/finalizer_weakref/ include/open/ jitrino/src/codegenerator/ia32/ jitrino/src/codegenerator/ipf/ jitrino/src/codegenerator/ipf/include/ jitrino/src/je... Date: Tue, 20 May 2008 18:38:25 -0000 To: commits@harmony.apache.org From: mcfirst@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080520183829.D6FC623889FF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcfirst Date: Tue May 20 11:38:23 2008 New Revision: 658384 URL: http://svn.apache.org/viewvc?rev=658384&view=rev Log: Unifying types with hycomp.h: changed Byte to U_8 Modified: harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeEmitter.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEncoder.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/inliner.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h harmony/enhanced/drlvm/trunk/vm/vmcore/include/mem_alloc.h harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/code_emit/Code_Emitter.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Code_Emitter.h harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/Emitter_IR.h harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/vm_ipf.h harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/mem_alloc.cpp 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/java6/context_6.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/java6/context_6.h Modified: harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp Tue May 20 11:38:23 2008 @@ -213,7 +213,7 @@ return NULL; } if (is_ip_past) { - addr = (void *)((Byte*)addr - 1); + addr = (U_8*)addr - 1; } #ifdef USE_METHOD_LOOKUP_CACHE Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp Tue May 20 11:38:23 2008 @@ -52,7 +52,7 @@ interior_pointer_set.resize(size); } - Partial_Reveal_Object* p_obj = (Partial_Reveal_Object*) ((Byte*)*slot - offset); + Partial_Reveal_Object* p_obj = (Partial_Reveal_Object*) ((U_8*)*slot - offset); assert(p_obj->vt_raw); slot_offset_entry* push_back_entry = (slot_offset_entry*)&interior_pointer_set[interior_pointer_num_count++]; push_back_entry->offset = offset; @@ -79,7 +79,7 @@ void** root_slot = entry_traverser->slot; Partial_Reveal_Object* root_base = (Partial_Reveal_Object*)entry_traverser->base; unsigned int root_offset = entry_traverser->offset; - void *new_slot_contents = (void *)((Byte*)root_base + root_offset); + void *new_slot_contents = (void *)((U_8*)root_base + root_offset); *root_slot = new_slot_contents; } //can not reset the table here, for the rootset may be updated multi times Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h Tue May 20 11:38:23 2008 @@ -51,7 +51,7 @@ inline REF *obj_get_referent_field(Partial_Reveal_Object *p_obj) { assert(p_obj); - return (REF*)(( Byte*)p_obj+get_gc_referent_offset()); + return (REF*)((U_8*)p_obj+get_gc_referent_offset()); } extern Boolean DURING_RESURRECTION; 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=658384&r1=658383&r2=658384&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 20 11:38:23 2008 @@ -70,8 +70,6 @@ typedef unsigned Boolean; -typedef unsigned char Byte; - //::For long long int, add the LL #ifndef __WORDSIZE // exclude remark #193: zero used for undefined preprocessing identifier #define __WORDSIZE 0 Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h Tue May 20 11:38:23 2008 @@ -43,12 +43,11 @@ /* Inclusion of all these functions into class support interface is yet to decide. */ /* "through VM" method */ -/* NOTE: reference to internal type Byte */ /** * Called by a EE to have the VM replace a section of executable code in a thread-safe fashion. */ -void vm_patch_code_block(Byte* code_block, Byte* new_code, size_t size); +void vm_patch_code_block(U_8* code_block, U_8* new_code, size_t size); /** * Called by a EE in order to be notified whenever the vtable entries for the given method Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h Tue May 20 11:38:23 2008 @@ -83,7 +83,7 @@ * * @sa method_allocate_info_block */ -DECLARE_OPEN(Byte *, method_allocate_data_block, (Method_Handle method, +DECLARE_OPEN(U_8*, method_allocate_data_block, (Method_Handle method, JIT_Handle j, size_t size, size_t alignment)); @@ -97,7 +97,7 @@ * of various memory blocks allocated by the VM. */ -DECLARE_OPEN(Byte *, method_allocate_jit_data_block, (Method_Handle method, +DECLARE_OPEN(U_8*, method_allocate_jit_data_block, (Method_Handle method, JIT_Handle j, size_t size, size_t alignment)); @@ -118,7 +118,7 @@ * allocated - the same as pass parameter size = 0 - function returns * only current address for allocation in pool but no memory is allocated. */ -DECLARE_OPEN(Byte *, +DECLARE_OPEN(U_8*, method_allocate_code_block, (Method_Handle m, JIT_Handle j, size_t size, @@ -135,7 +135,7 @@ * * @sa method_allocate_data_block */ -DECLARE_OPEN(Byte *, method_allocate_info_block, (Method_Handle method, +DECLARE_OPEN(U_8*, method_allocate_info_block, (Method_Handle method, JIT_Handle j, size_t size)); @@ -145,7 +145,7 @@ * method_allocate_code_block(). * A pair uniquely identifies a code block. */ -DECLARE_OPEN(Byte *, method_get_code_block_addr_jit, (Method_Handle method, +DECLARE_OPEN(U_8*, method_get_code_block_addr_jit, (Method_Handle method, JIT_Handle j)); /** @@ -161,7 +161,7 @@ * A triple uniquely identifies a * code block. */ -DECLARE_OPEN(Byte *, method_get_code_block_addr_jit_new, (Method_Handle method, +DECLARE_OPEN(U_8*, method_get_code_block_addr_jit_new, (Method_Handle method, JIT_Handle j, int id)); @@ -180,7 +180,7 @@ * method_allocate_info_block(). * A pair uniquely identifies a JIT info block. */ -DECLARE_OPEN(Byte *, method_get_info_block_jit, (Method_Handle method, +DECLARE_OPEN(U_8*, method_get_info_block_jit, (Method_Handle method, JIT_Handle j)); /** @@ -207,7 +207,7 @@ * It may be a lot cheaper to batch up the patch requests, so we may need to * extend this interface. */ -DECLARE_OPEN(void, vm_patch_code_block, (Byte *code_block, Byte *new_code, size_t size)); +DECLARE_OPEN(void, vm_patch_code_block, (U_8* code_block, U_8* new_code, size_t size)); /** * Called by a JIT to have VM synchronously (in the same thread) compile a method Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h Tue May 20 11:38:23 2008 @@ -369,9 +369,8 @@ * @return The method bytecode array. * * @note An assertion is raised if the method equals to NULL. - * @note Reference to type Byte. */ -DECLARE_OPEN(const Byte*, method_get_bytecode, (Method_Handle method)); +DECLARE_OPEN(const U_8*, method_get_bytecode, (Method_Handle method)); /** * Returns StackMapTable attribute. @@ -382,7 +381,7 @@ * * @return StackMapTable bytes */ -DECLARE_OPEN(unsigned char*, method_get_stackmaptable, (Method_Handle hmethod)); +DECLARE_OPEN(U_8*, method_get_stackmaptable, (Method_Handle hmethod)); /** * Returns the maximum number of local variables for the given method. @@ -452,11 +451,9 @@ * * @return The pointer to the allocated info block. * - * @note Reference to type Byte. - * * @see method_allocate_data_block */ -DECLARE_OPEN(Byte*, method_allocate_info_block, +DECLARE_OPEN(U_8*, method_allocate_info_block, (Method_Handle method, JIT_Handle jit, size_t size)); /** @@ -477,12 +474,11 @@ * * @return The pointer to the allocated data block. * - * @note Reference to type Byte. * @note FIXME This has to go to the compilation infrastructure interface. * * @see method_allocate_info_block */ -DECLARE_OPEN(Byte*, method_allocate_data_block, +DECLARE_OPEN(U_8*, method_allocate_data_block, (Method_Handle method, JIT_Handle jit, size_t size, size_t alignment)); /** @@ -493,7 +489,7 @@ * this interface to have more control over the layout of various * memory blocks allocated by the VM. */ -DECLARE_OPEN(Byte*, method_allocate_jit_data_block, +DECLARE_OPEN(U_8*, method_allocate_jit_data_block, (Method_Handle method, JIT_Handle jit, size_t size, size_t alignment)); /** @@ -522,7 +518,7 @@ * * @note FIXME This has to go to the compilation infrastructure interface. */ -DECLARE_OPEN(Byte*, method_allocate_code_block, +DECLARE_OPEN(U_8*, method_allocate_code_block, (Method_Handle method, JIT_Handle jit, size_t size, size_t alignment, CodeBlockHeat heat, int id, Code_Allocation_Action action)); @@ -537,7 +533,7 @@ * * @return address of the requested code block */ -DECLARE_OPEN(Byte*, method_get_code_block_jit, +DECLARE_OPEN(U_8*, method_get_code_block_jit, (Method_Handle method, JIT_Handle j));/*, int id));*/ /** @@ -564,10 +560,8 @@ * @param jit - the JIT handle * * @return The pointer to the allocated info block. - * - * @note Reference to type Byte. */ -DECLARE_OPEN(Byte*, method_get_info_block_jit, (Method_Handle method, JIT_Handle jit)); +DECLARE_OPEN(U_8*, method_get_info_block_jit, (Method_Handle method, JIT_Handle jit)); /** * Get the size of the memory block allocated earlier by Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32BCMap.h Tue May 20 11:38:23 2008 @@ -46,7 +46,7 @@ return 4 /*size*/+(uint32)theMap.size() * (4 + 2/*native offset + bc offset*/); } - void write(Byte* image) { + void write(U_8* image) { *((uint32*)image)=(uint32)theMap.size(); uint32 imageOffset = 4; for (BCByNCMap::const_iterator it = theMap.begin(), end = theMap.end(); it!=end; it++) { @@ -60,7 +60,7 @@ return; } - POINTER_SIZE_INT readByteSize(const Byte* image) const { + POINTER_SIZE_INT readByteSize(const U_8* image) const { uint32 sizeOfMap = *(uint32*)image;; return 4 + sizeOfMap * (4+2); } @@ -70,7 +70,7 @@ theMap[key] = value; } - static uint16 get_bc_offset_for_native_offset(uint32 ncOffset, Byte* image) { + static uint16 get_bc_offset_for_native_offset(uint32 ncOffset, U_8* image) { uint32 mapSize = *(uint32*)image; //read map size uint32 imageOffset=4; for (uint32 i = 0; i < mapSize; i++) { @@ -85,7 +85,7 @@ return ILLEGAL_BC_MAPPING_VALUE; } - static uint32 get_native_offset_for_bc_offset(uint16 bcOff, Byte* image) { + static uint32 get_native_offset_for_bc_offset(uint16 bcOff, U_8* image) { uint32 mapSize = *(uint32*)image; //read map size uint32 imageOffset=4; for (uint32 i = 0; i < mapSize; i++) { 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=658384&r1=658383&r2=658384&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 20 11:38:23 2008 @@ -705,9 +705,9 @@ bool RuntimeInterface::recompiledMethodEvent(MethodDesc *recompiledMethodDesc, void * data) { - Byte ** indirectAddr = (Byte **)recompiledMethodDesc->getIndirectAddress(); - Byte * targetAddr = *indirectAddr; - Byte * callAddr = (Byte*)data; + U_8** indirectAddr = (U_8**)recompiledMethodDesc->getIndirectAddress(); + U_8* targetAddr = *indirectAddr; + U_8* callAddr = (U_8*)data; uint64 offset = targetAddr - callAddr - 5; @@ -719,14 +719,14 @@ #else 0; // no additional MOV on ia32 #endif - Byte * movAddr = callAddr - movSize; + U_8* movAddr = callAddr - movSize; // there is a reserved region for this self-jump dumped with nops // it is from 'callAddr - movSize' (movAddr) // [- 10 (reserved for 'MOV r11, callTarget' if !fit32(offset))] (EM64T only) // - 3 (to provide self-jump aligned) // to 'callAddr - movSize' (movAddr) - Byte* jmpAddr = movAddr - 3; + U_8* jmpAddr = movAddr - 3; if( 0 != (POINTER_SIZE_INT(jmpAddr) & 0x1) ) { jmpAddr++; } @@ -837,8 +837,8 @@ irManager->getMethodDesc(). setExceptionHandlerInfo(i, - (Byte*)info.regionStart, (Byte*)info.regionEnd, - (Byte*)info.handlerAddr, + (U_8*)info.regionStart, (U_8*)info.regionEnd, + (U_8*)info.handlerAddr, info.exceptionType, info.exceptionObjectIsDead); } 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=658384&r1=658383&r2=658384&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 20 11:38:23 2008 @@ -263,7 +263,7 @@ return size; } -POINTER_SIZE_INT GCMap::readByteSize(const Byte* input) { +POINTER_SIZE_INT GCMap::readByteSize(const U_8* input) { POINTER_SIZE_INT* data = (POINTER_SIZE_INT*)input; POINTER_SIZE_INT gcMapSizeInBytes; @@ -283,7 +283,7 @@ }; #endif -void GCMap::write(Byte* output) { +void GCMap::write(U_8* output) { POINTER_SIZE_INT* data = (POINTER_SIZE_INT*)output; data[0] = getByteSize(); data[1] = (POINTER_SIZE_INT)gcSafePoints.size(); @@ -522,8 +522,8 @@ // Compute stack information uint32 stackInfoSize = (uint32)StackInfo::getByteSize(methodDesc); - Byte* infoBlock = methodDesc->getInfoBlock(); - Byte* gcBlock = infoBlock + stackInfoSize; + U_8* infoBlock = methodDesc->getInfoBlock(); + U_8* gcBlock = infoBlock + stackInfoSize; #ifdef _EM64T_ const POINTER_SIZE_INT* gcPointImage = GCMap::findGCSafePointStart((POINTER_SIZE_INT*)gcBlock, *context->p_rip); #else @@ -572,7 +572,7 @@ uint32 bcMapSize = (uint32)bcMap->getByteSize(); // we should write at least the size of map in the info block assert(bcMapSize >= 4); // minimum size for empty BCMap for all platforms - Byte* infoBlock = compIntf.allocateInfoBlock(stackInfoSize + gcInfoSize + bcMapSize); + U_8* infoBlock = compIntf.allocateInfoBlock(stackInfoSize + gcInfoSize + bcMapSize); stackInfo->write(infoBlock); gcMap->write(infoBlock+stackInfoSize); Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32GCMap.h Tue May 20 11:38:23 2008 @@ -49,8 +49,8 @@ void registerInsts(IRManager& irm); POINTER_SIZE_INT getByteSize() const ; - static POINTER_SIZE_INT readByteSize(const Byte* input); - void write(Byte*); + static POINTER_SIZE_INT readByteSize(const U_8* input); + void write(U_8*); const GCSafePointsInfo* getGCSafePointsInfo() const {return offsetsInfo;} static const POINTER_SIZE_INT* findGCSafePointStart(const POINTER_SIZE_INT* image, POINTER_SIZE_INT ip); Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.h Tue May 20 11:38:23 2008 @@ -279,9 +279,9 @@ /** AOT support: serializes inst into stream */ - Byte * serialize(Byte * stream, Inst * inst); + U_8* serialize(U_8* stream, Inst* inst); /** AOT support: deserializes inst from stream */ - Byte * deserialize(Byte * stream, Inst *& inst); + U_8* deserialize(U_8* stream, Inst*& inst); //----------------------------------------------------------------------------------------------- /** calculate liveness information */ Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InternalProfiler.cpp Tue May 20 11:38:23 2008 @@ -652,7 +652,7 @@ *(ms->bbStats[node->getId()].bbExecCount) = 0; node->prependInst(irManager->newInst(Mnemonic_POPFD)); #ifndef _EM64T_ - node->prependInst(irManager->newInst(Mnemonic_ADC, irManager->newMemOpnd(irManager->getTypeFromTag(Type::Int32), MemOpndKind_Heap, NULL, int((Byte*)(ms->bbStats[node->getId()].bbExecCount) + 4)), irManager->newImmOpnd(irManager->getTypeFromTag(Type::Int32),0))); + node->prependInst(irManager->newInst(Mnemonic_ADC, irManager->newMemOpnd(irManager->getTypeFromTag(Type::Int32), MemOpndKind_Heap, NULL, int((U_8*)(ms->bbStats[node->getId()].bbExecCount) + 4)), irManager->newImmOpnd(irManager->getTypeFromTag(Type::Int32),0))); node->prependInst(irManager->newInst(Mnemonic_ADD, irManager->newMemOpnd(irManager->getTypeFromTag(Type::Int32), MemOpndKind_Heap, NULL, int(ms->bbStats[node->getId()].bbExecCount)), irManager->newImmOpnd(irManager->getTypeFromTag(Type::Int32),1))); #endif Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32RuntimeInterface.cpp Tue May 20 11:38:23 2008 @@ -88,7 +88,7 @@ { StackInfo stackInfo; - Byte* infoBlock = method->getInfoBlock(); + U_8* infoBlock = method->getInfoBlock(); if (infoBlock == NULL) { assert(0 && "missing info block for method"); return false; @@ -111,7 +111,7 @@ bool RuntimeInterface::getNativeLocationForBc(MethodDesc* method, uint16 bc_pc, POINTER_SIZE_INT *native_pc) { StackInfo stackInfo; - Byte* infoBlock = method->getInfoBlock(); + U_8* infoBlock = method->getInfoBlock(); POINTER_SIZE_INT stackInfoSize = stackInfo.readByteSize(infoBlock); POINTER_SIZE_INT gcMapSize = GCMap::readByteSize(infoBlock + stackInfoSize); Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.cpp Tue May 20 11:38:23 2008 @@ -98,11 +98,11 @@ } POINTER_SIZE_INT StackInfo::getByteSize(MethodDesc* md) { - Byte* data = md->getInfoBlock(); + U_8* data = md->getInfoBlock(); return *(POINTER_SIZE_INT*)data; } -POINTER_SIZE_INT StackInfo::readByteSize(const Byte* bytes) const{ +POINTER_SIZE_INT StackInfo::readByteSize(const U_8* bytes) const{ POINTER_SIZE_INT* data = (POINTER_SIZE_INT *) bytes; POINTER_SIZE_INT sizeInBytes = *data; @@ -111,8 +111,8 @@ typedef DepthEntry * EntryPtr; -void StackInfo::write(Byte* bytes) { - Byte* data = bytes; +void StackInfo::write(U_8* bytes) { + U_8* data = bytes; StackInfo* serializedInfo = (StackInfo*)data; *serializedInfo = *this; serializedInfo->byteSize = getByteSize(); @@ -124,7 +124,7 @@ for(DepthMap::iterator dmit = stackDepthInfo->begin(); dmit != stackDepthInfo->end(); dmit++) { hashSet(entries, dmit->first, hashTableSize, dmit->second, mm); } - Byte* next = data + hashTableSize * sizeof(POINTER_SIZE_INT); + U_8* next = data + hashTableSize * sizeof(POINTER_SIZE_INT); for(uint32 i = 0; i< hashTableSize; i++) { DepthEntry * e = entries[i]; POINTER_SIZE_INT serializedEntryAddr = 0; @@ -140,10 +140,10 @@ *((POINTER_SIZE_INT*)data)= serializedEntryAddr; data+=sizeof(POINTER_SIZE_INT); } - assert(getByteSize() == (POINTER_SIZE_INT) (((Byte*) next) - bytes)); + assert(getByteSize() == (POINTER_SIZE_INT) (((U_8*)next) - bytes)); } -DepthEntry * getHashEntry(Byte * data, POINTER_SIZE_INT eip, uint32 size) +DepthEntry * getHashEntry(U_8* data, POINTER_SIZE_INT eip, uint32 size) { if(!size) return NULL; @@ -157,7 +157,7 @@ } void StackInfo::read(MethodDesc* pMethodDesc, POINTER_SIZE_INT eip, bool isFirst) { - Byte* data = pMethodDesc->getInfoBlock(); + U_8* data = pMethodDesc->getInfoBlock(); byteSize = ((StackInfo *)data)->byteSize; hashTableSize = ((StackInfo *)data)->hashTableSize; frameSize = ((StackInfo *)data)->frameSize; Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32StackInfo.h Tue May 20 11:38:23 2008 @@ -112,7 +112,7 @@ /** writes StackInfo data into memory */ - void write(Byte* output); + void write(U_8* output); /** reads StackInfo data from MethodDesc */ @@ -182,7 +182,7 @@ /** read byte size from info block * */ - POINTER_SIZE_INT readByteSize(const Byte* input) const; + POINTER_SIZE_INT readByteSize(const U_8* input) const; private: POINTER_SIZE_INT byteSize; Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEncoder.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEncoder.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEncoder.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfEncoder.cpp Tue May 20 11:38:23 2008 @@ -1688,7 +1688,7 @@ p[1] |= s[2] << 23; // write to callAddr - VMInterface::rewriteCodeBlock((Byte *)callAddr, (Byte *)p, IPF_BUNDLE_SIZE); + VMInterface::rewriteCodeBlock((U_8*)callAddr, (U_8*)p, IPF_BUNDLE_SIZE); // IPF_LOG << "Patch brl.call to 0x" << hex // << (uint64)methodAddr << " at 0x" << (uint64)callAddr << "\n" Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeInterface.cpp Tue May 20 11:38:23 2008 @@ -40,7 +40,7 @@ // cout << "IPF::RuntimeInterface::unwindStack " << methodDesc->getName() << endl; - Byte *infoBlock = methodDesc->getInfoBlock(); // get method infoBlock + U_8* infoBlock = methodDesc->getInfoBlock(); // get method infoBlock StackInfo stackInfo = *((StackInfo*) infoBlock); // read StackInfo structure uint64 sp = jitFrameContext->sp; // get current frame sp @@ -131,15 +131,15 @@ // cout << "IPF::RuntimeInterface::getGCRootSet" << endl; - gcInterface = gcInterface_; - context = context_; - Byte *infoBlock = methodDesc->getInfoBlock(); - Byte *gcInfo = infoBlock + sizeof(StackInfo); - uint64 currIp = *context->p_eip; - uint32 gcSize = *((uint32 *)gcInfo); + gcInterface = gcInterface_; + context = context_; + U_8* infoBlock = methodDesc->getInfoBlock(); + U_8* gcInfo = infoBlock + sizeof(StackInfo); + uint64 currIp = *context->p_eip; + uint32 gcSize = *((uint32 *)gcInfo); // cout << "getGCRootSet for ip " << hex << currIp << dec << " method " << methodDesc->getName() << endl; - Byte* safePoint = findSafePoint(gcInfo, gcSize, currIp); + U_8* safePoint = findSafePoint(gcInfo, gcSize, currIp); enumerateRootSet(gcInterface, context, safePoint); } @@ -214,13 +214,13 @@ // GC Root Set //----------------------------------------------------------------------------------------// -Byte* RuntimeInterface::findSafePoint(Byte *info, uint32 size, uint64 currIp) { - - uint32 offset = ROOT_SET_HEADER_SIZE; - Byte *safePoint = NULL; - uint32 spSize = 0; - uint64 spAddress = 0; - +U_8* RuntimeInterface::findSafePoint(U_8* info, uint32 size, uint64 currIp) +{ + uint32 offset = ROOT_SET_HEADER_SIZE; + U_8* safePoint = NULL; + uint32 spSize = 0; + uint64 spAddress = 0; + while (offset < size) { safePoint = info + offset; spSize = *((uint32 *)safePoint); @@ -229,7 +229,7 @@ if (spAddress == currIp) return safePoint; offset += spSize; } - + IPF_ERR << " No safe point found"; return NULL; } @@ -237,14 +237,14 @@ //----------------------------------------------------------------------------------------// // -void RuntimeInterface::enumerateRootSet(GCInterface *gcInterface, - const JitFrameContext *context, - Byte *safePoint) { - +void RuntimeInterface::enumerateRootSet(GCInterface* gcInterface, + const JitFrameContext* context, + U_8* safePoint) +{ uint32 size = *((uint32 *)(safePoint)); int32* ptr = (int32 *)(safePoint + SAFE_POINT_HEADER_SIZE); int32* maxPtr = (int32 *)(safePoint + size); - + while (ptr < maxPtr) { if (isMptr(*ptr)) reportMptr(*(ptr++), *(ptr++)); else reportBase(*(ptr++)); Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfRuntimeSupport.cpp Tue May 20 11:38:23 2008 @@ -42,11 +42,11 @@ // TryRegion //========================================================================================// -TryRegion::TryRegion(Byte *startAddr, - Byte *endAddr, - Byte *handlerAddr, - ObjectType *exceptionType, - bool isExceptionObjDead) : +TryRegion::TryRegion(U_8* startAddr, + U_8* endAddr, + U_8* handlerAddr, + ObjectType* exceptionType, + bool isExceptionObjDead) : startAddr(startAddr), endAddr(endAddr), handlerAddr(handlerAddr), @@ -90,22 +90,22 @@ IPF_LOG << endl << " Register Exception Handlers" << dec << endl; registerExceptionHandlers(); - + IPF_LOG << endl << " Make Stack Info" << endl; StackInfo *stackInfo = makeStackInfo(); uint32 stackInfoSize = sizeof(StackInfo); IPF_LOG << " stack info size (bytes): " << stackInfoSize << endl; - + IPF_LOG << endl << " Make Root Seet Info" << endl; Uint32Vector rootSetInfo(mm); makeRootSetInfo(rootSetInfo); uint32 rootSetInfoSize = ROOT_SET_HEADER_SIZE + rootSetInfo.size() * sizeof(uint32); IPF_LOG << " GC root set info size (bytes): " << rootSetInfoSize << endl; - + // create info block uint32 infoBlockSize = stackInfoSize + rootSetInfoSize; - Byte *infoBlock = compilationInterface.allocateInfoBlock(infoBlockSize); - + U_8* infoBlock = compilationInterface.allocateInfoBlock(infoBlockSize); + // write stack info *((StackInfo *)infoBlock) = *stackInfo; @@ -117,7 +117,7 @@ gcInfo[j] = rootSetInfo[i]; } } - + //----------------------------------------------------------------------------------------// // Exception registration //----------------------------------------------------------------------------------------// @@ -182,19 +182,19 @@ IPF_LOG << ", dispatch: node" << dispatchNode->getId(); - Byte *startAddr = (Byte *)regionStart->getAddress(); - Byte *endAddr = (Byte *)regionEnd->getAddress(); + U_8* startAddr = (U_8*)regionStart->getAddress(); + U_8* endAddr = (U_8*)regionEnd->getAddress(); EdgeVector &outEdges = dispatchNode->getOutEdges(); // get out edges sort(outEdges.begin(), outEdges.end(), greaterPriority); // sort them by Priority - + for (uint16 i=0; igetEdgeKind() == EDGE_EXCEPTION) { - BbNode *handlerNode = (BbNode *)edge->getTarget(); - Byte *handlerAddr = (Byte *)handlerNode->getAddress(); - ObjectType *exceptionType = (ObjectType *)((ExceptionEdge *)edge)->getExceptionType(); - TryRegion *region = new(mm) TryRegion(startAddr, endAddr, handlerAddr, exceptionType, false); + BbNode* handlerNode = (BbNode*)edge->getTarget(); + U_8* handlerAddr = (U_8*)handlerNode->getAddress(); + ObjectType* exceptionType = (ObjectType *)((ExceptionEdge *)edge)->getExceptionType(); + TryRegion* region = new(mm) TryRegion(startAddr, endAddr, handlerAddr, exceptionType, false); tryRegions.push_back(region); IPF_LOG << ", handler: node" << handlerNode->getId(); Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeInterface.h Tue May 20 11:38:23 2008 @@ -48,13 +48,13 @@ protected: // getGCRootSet support - Byte *findSafePoint(Byte*, uint32, uint64); - void enumerateRootSet(GCInterface*, const JitFrameContext*, Byte*); - void **getContextValue(int32); + U_8* findSafePoint(U_8*, uint32, uint64); + void enumerateRootSet(GCInterface*, const JitFrameContext*, U_8*); + void** getContextValue(int32); void reportMptr(int32, int32); void reportBase(int32); bool isMptr(int32); - + GCInterface *gcInterface; const JitFrameContext *context; }; Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/include/IpfRuntimeSupport.h Tue May 20 11:38:23 2008 @@ -53,15 +53,15 @@ //========================================================================================// struct TryRegion { - TryRegion(Byte*, Byte*, Byte*, ObjectType*, bool); + TryRegion(U_8*, U_8*, U_8*, ObjectType*, bool); - Byte *startAddr; - Byte *endAddr; - Byte *handlerAddr; - ObjectType *exceptionType; - bool isExceptionObjDead; + U_8* startAddr; + U_8* endAddr; + U_8* handlerAddr; + ObjectType* exceptionType; + bool isExceptionObjDead; }; - + //========================================================================================// // MptrDef //========================================================================================// Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp Tue May 20 11:38:23 2008 @@ -641,13 +641,13 @@ //next instruction //2. Replace all the remaining bytes of counter instruction with nops //3. Atomically replace jump with 2 nops - Byte* methodAddr = method_get_code_block_jit(mh, jit); + U_8* methodAddr = method_get_code_block_jit(mh, jit); for (uint32 i = 0 ; igetCodeBlockSize(0); - Byte * start = size ? md->getCodeBlockAddress(0) : 0; + U_8* start = size ? md->getCodeBlockAddress(0) : 0; info << "\tnative code size=" << size << " code range=[" << (void*)start << "," << (void*)(start+size) << "]"; } Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp Tue May 20 11:38:23 2008 @@ -440,11 +440,11 @@ // stack info // GC info -Byte* +U_8* methodGetStacknGCInfoBlock(Method_Handle method, JIT_Handle jit) { - Byte* addr = method_get_info_block_jit(method, jit); - addr += sizeof(void *); // skip the header + U_8* addr = method_get_info_block_jit(method, jit); + addr += sizeof(void*); // skip the header return addr; } @@ -531,7 +531,7 @@ } void -VMInterface::rewriteCodeBlock(Byte* codeBlock, Byte* newCode, size_t size) { +VMInterface::rewriteCodeBlock(U_8* codeBlock, U_8* newCode, size_t size) { vm_patch_code_block(codeBlock, newCode, size); } @@ -710,7 +710,7 @@ // Method info // -const Byte* MethodDesc::getByteCodes() const {return method_get_bytecode(drlMethod);} +const U_8* MethodDesc::getByteCodes() const {return method_get_bytecode(drlMethod);} uint32 MethodDesc::getByteCodeSize() const {return (uint32) method_get_bytecode_length(drlMethod);} uint16 MethodDesc::getMaxStack() const {return (uint16) method_get_max_stack(drlMethod);} uint32 MethodDesc::getNumHandlers() const {return method_get_exc_handler_number(drlMethod);} @@ -751,7 +751,7 @@ } // accessors for method info, code and data -Byte* MethodDesc::getInfoBlock() const { +U_8* MethodDesc::getInfoBlock() const { return methodGetStacknGCInfoBlock(drlMethod, getJitHandle()); } @@ -759,7 +759,7 @@ return methodGetStacknGCInfoBlockSize(drlMethod, getJitHandle()); } -Byte* MethodDesc::getCodeBlockAddress(int32 id) const { +U_8* MethodDesc::getCodeBlockAddress(int32 id) const { return method_get_code_block_addr_jit_new(drlMethod,getJitHandle(), id); } @@ -801,10 +801,10 @@ void MethodDesc::setExceptionHandlerInfo(uint32 exceptionHandlerNumber, - Byte* startAddr, - Byte* endAddr, - Byte* handlerAddr, - NamedType* exceptionType, + U_8* startAddr, + U_8* endAddr, + U_8* handlerAddr, + NamedType* exceptionType, bool exceptionObjIsDead) { void* exn_handle; @@ -1142,27 +1142,30 @@ method_unlock(mh); } -Byte* CompilationInterface::allocateCodeBlock(size_t size, size_t alignment, CodeBlockHeat heat, int32 id, +U_8* CompilationInterface::allocateCodeBlock(size_t size, size_t alignment, CodeBlockHeat heat, int32 id, bool simulate) { return method_allocate_code_block(methodToCompile->getMethodHandle(), getJitHandle(), size, alignment, heat, id, simulate ? CAA_Simulate : CAA_Allocate); } -Byte* CompilationInterface::allocateDataBlock(size_t size, size_t alignment) { + +U_8* CompilationInterface::allocateDataBlock(size_t size, size_t alignment) { return method_allocate_data_block(methodToCompile->getMethodHandle(),getJitHandle(),size, alignment); } -Byte* CompilationInterface::allocateInfoBlock(size_t size) { + +U_8* CompilationInterface::allocateInfoBlock(size_t size) { size += sizeof(void *); - Byte *addr = method_allocate_info_block(methodToCompile->getMethodHandle(),getJitHandle(),size); + U_8* addr = method_allocate_info_block(methodToCompile->getMethodHandle(),getJitHandle(),size); return (addr + sizeof(void *)); } -Byte* CompilationInterface::allocateJITDataBlock(size_t size, size_t alignment) { + +U_8* CompilationInterface::allocateJITDataBlock(size_t size, size_t alignment) { return method_allocate_jit_data_block(methodToCompile->getMethodHandle(),getJitHandle(),size, alignment); } + MethodDesc* CompilationInterface::getMethodDesc(Method_Handle method) { return getMethodDesc(method, getJitHandle()); } - static uint32 getArrayDims(Class_Handle cl, uint32 cpIndex) { return class_cp_get_num_array_dimensions(cl, (unsigned short)cpIndex); } Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.h Tue May 20 11:38:23 2008 @@ -108,13 +108,13 @@ static void* getHeapCeiling(); - static void rewriteCodeBlock(Byte* codeBlock, Byte* newCode, size_t size); + static void rewriteCodeBlock(U_8* codeBlock, U_8* newCode, size_t size); - static bool setVmAdapter(vm_adaptor_t vm); - static bool isValidFeature(const char* id); + static bool setVmAdapter(vm_adaptor_t vm); + static bool isValidFeature(const char* id); protected: - static vm_adaptor_t vm; + static vm_adaptor_t vm; }; @@ -207,7 +207,7 @@ // Method info // - const Byte* getByteCodes() const; + const U_8* getByteCodes() const; uint32 getByteCodeSize() const; uint16 getMaxStack() const; uint32 getNumHandlers() const; @@ -219,9 +219,9 @@ // // accessors for method info, code and data // - Byte* getInfoBlock() const; + U_8* getInfoBlock() const; uint32 getInfoBlockSize() const; - Byte* getCodeBlockAddress(int32 id) const; + U_8* getCodeBlockAddress(int32 id) const; uint32 getCodeBlockSize(int32 id) const; // sets and gets MethodSideEffect property for the compiled method @@ -233,11 +233,11 @@ // void setNumExceptionHandler(uint32 numHandlers); void setExceptionHandlerInfo(uint32 exceptionHandlerNumber, - Byte* startAddr, - Byte* endAddr, - Byte* handlerAddr, - NamedType* exceptionType, - bool exceptionObjIsDead); + U_8* startAddr, + U_8* endAddr, + U_8* handlerAddr, + NamedType* exceptionType, + bool exceptionObjIsDead); // @@ -356,14 +356,14 @@ // Memory allocation API // all of these are for the method being compiled - Byte* allocateCodeBlock(size_t size, size_t alignment, CodeBlockHeat heat, + U_8* allocateCodeBlock(size_t size, size_t alignment, CodeBlockHeat heat, int32 id, bool simulate); - Byte* allocateDataBlock(size_t size, size_t alignment); + U_8* allocateDataBlock(size_t size, size_t alignment); - Byte* allocateInfoBlock(size_t size); + U_8* allocateInfoBlock(size_t size); - Byte* allocateJITDataBlock(size_t size, size_t alignment); + U_8* allocateJITDataBlock(size_t size, size_t alignment); /** * Acquires a lock to protect method's data modifications (i.e. code/info Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h Tue May 20 11:38:23 2008 @@ -478,7 +478,7 @@ // where memory is at a premium. // The value returned by getByteCodeAddr may be NULL in which case the // bytecodes are not available (presumably they have been garbage collected by VM). - const Byte *get_byte_code_addr() {return _byte_codes;} + const U_8* get_byte_code_addr() {return _byte_codes;} unsigned get_byte_code_size() {return _byte_code_length;} // From the class file (Sec. 4.7.4) @@ -676,9 +676,9 @@ uint16 _max_locals; uint16 _n_exceptions; // num exceptions method can throw uint16 _n_handlers; // num exception handlers in byte codes - String **_exceptions; // array of exceptions method can throw + String** _exceptions; // array of exceptions method can throw uint32 _byte_code_length; // num bytes of byte code - Byte *_byte_codes; // method's byte codes + U_8* _byte_codes; // method's byte codes Handler *_handlers; // array of exception handlers in code Method *_intf_method_for_fake_method; struct { Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h Tue May 20 11:38:23 2008 @@ -44,7 +44,7 @@ * The first function flushes a particular block of code, * another should be called after all blocks are flushed. */ -void compile_flush_generated_code_block(Byte*, size_t); +void compile_flush_generated_code_block(U_8*, size_t); void compile_flush_generated_code(); /** * Execution manager uses this method to call back to VM to compile @@ -66,9 +66,9 @@ */ NativeCodePtr compile_me(Method* method); -void patch_code_with_threads_suspended(Byte *code_block, Byte *new_code, size_t size); +void patch_code_with_threads_suspended(U_8* code_block, U_8* new_code, size_t size); -typedef char * Emitter_Handle; +typedef char* Emitter_Handle; struct Compilation_Handle { Global_Env* env; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/environment.h Tue May 20 11:38:23 2008 @@ -133,7 +133,7 @@ * Base address of Java heap. */ - Byte* heap_base; + U_8* heap_base; /** * Ceiling of Java heap. @@ -143,14 +143,14 @@ * @note We assume Java heap uses one continuous memory block. */ - Byte* heap_end; + U_8* heap_end; /** * This will be set to either NULL or heap_base depending * on whether compressed references are used. */ - Byte* managed_null; + U_8* managed_null; /** * Preloaded strings Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/mem_alloc.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/mem_alloc.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/mem_alloc.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/mem_alloc.h Tue May 20 11:38:23 2008 @@ -36,9 +36,9 @@ #define MEMORY_UTILIZATION_LIMIT 15 typedef struct PoolDescriptor { - Byte *_begin; // next free byte in memory chunk - Byte *_end; // end of memory chunk - size_t _size; // size of memory chunk + U_8* _begin; // next free byte in memory chunk + U_8* _end; // end of memory chunk + size_t _size; // size of memory chunk port_vmem_t* _descriptor; // for further memory deallocation PoolDescriptor* _next; } PoolDescriptor; @@ -95,10 +95,10 @@ // alloc is synchronized inside the class void* alloc(size_t size, size_t alignment, Code_Allocation_Action action); - Byte* get_base(); + U_8* get_base(); protected: - Byte* _base; + U_8* _base; size_t _reserved; size_t _committed; size_t _allocated; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/vtable.h Tue May 20 11:38:23 2008 @@ -64,7 +64,7 @@ } typedef struct VTable { - Byte _gc_private_information[GC_BYTES_IN_VTABLE]; + U_8 _gc_private_information[GC_BYTES_IN_VTABLE]; ManagedObject* jlC; unsigned int vtmark; Class* clss; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Tue May 20 11:38:23 2008 @@ -249,29 +249,28 @@ } // method_is_native -Byte* method_allocate_info_block(Method_Handle m, JIT_Handle j, size_t size) +U_8* method_allocate_info_block(Method_Handle m, JIT_Handle j, size_t size) { assert(m); - return (Byte *)((Method *)m)->allocate_jit_info_block(size, (JIT *)j); + return (U_8*)(m->allocate_jit_info_block(size, (JIT *)j)); } //method_allocate_info_block -Byte *method_allocate_jit_data_block(Method_Handle m, JIT_Handle j, size_t size, size_t alignment) +U_8* method_allocate_jit_data_block(Method_Handle m, JIT_Handle j, size_t size, size_t alignment) { assert(m); - return (Byte *)((Method *)m)->allocate_JIT_data_block(size, (JIT *)j, alignment); + return (U_8*)(m->allocate_JIT_data_block(size, (JIT *)j, alignment)); } //method_allocate_jit_data_block -Byte *method_get_info_block_jit(Method_Handle m, JIT_Handle j) +U_8* method_get_info_block_jit(Method_Handle m, JIT_Handle j) { assert(m); - Method* method = (Method*) m; - CodeChunkInfo *jit_info = method->get_chunk_info_no_create_mt((JIT *)j, CodeChunkInfo::main_code_chunk_id); + CodeChunkInfo *jit_info = m->get_chunk_info_no_create_mt((JIT *)j, CodeChunkInfo::main_code_chunk_id); if (jit_info == NULL) { return NULL; } - return (Byte *)jit_info->_jit_info_block; + return (U_8*)jit_info->_jit_info_block; } //method_get_info_block_jit @@ -286,14 +285,14 @@ -Byte *method_allocate_data_block(Method_Handle m, JIT_Handle j, size_t size, size_t alignment) +U_8* method_allocate_data_block(Method_Handle m, JIT_Handle j, size_t size, size_t alignment) { assert(m); - return (Byte *)((Method *)m)->allocate_rw_data_block(size, alignment, (JIT *)j); + return (U_8*)(m->allocate_rw_data_block(size, alignment, (JIT*)j)); } //method_allocate_data_block -Byte * +U_8* method_allocate_code_block(Method_Handle m, JIT_Handle j, size_t size, @@ -302,8 +301,7 @@ int id, Code_Allocation_Action action) { - Method *method = (Method *)m; - assert(method); + assert(m); JIT *jit = (JIT *)j; assert(jit); @@ -319,13 +317,13 @@ } // the following method is safe to call from multiple threads - Byte *code_block = (Byte *) method->allocate_code_block_mt(size, alignment, jit, drlHeat, id, action); + U_8* code_block = (U_8*)m->allocate_code_block_mt(size, alignment, jit, drlHeat, id, action); return code_block; } // method_allocate_code_block -Byte* method_get_code_block_jit(Method_Handle m, JIT_Handle j) +U_8* method_get_code_block_jit(Method_Handle m, JIT_Handle j) { assert(m); return method_get_code_block_addr_jit_new(m, j, 0); @@ -341,14 +339,14 @@ -Byte *method_get_code_block_addr_jit_new(Method_Handle method, +U_8* method_get_code_block_addr_jit_new(Method_Handle method, JIT_Handle j, int id) { assert(method); CodeChunkInfo* jit_info = method->get_chunk_info_no_create_mt((JIT *)j, id); assert(jit_info); - return (Byte*)jit_info->get_code_block_addr(); + return (U_8*)jit_info->get_code_block_addr(); } //method_get_code_block_addr_jit_new @@ -363,7 +361,7 @@ } //method_get_code_block_size_jit_new -const Byte* method_get_bytecode(Method_Handle m) +const U_8* method_get_bytecode(Method_Handle m) { assert(m); return m->get_byte_code_addr(); @@ -1740,7 +1738,7 @@ } //vm_register_jit_recompiled_method_callback -void vm_patch_code_block(Byte *code_block, Byte *new_code, size_t size) +void vm_patch_code_block(U_8* code_block, U_8* new_code, size_t size) { assert(code_block != NULL); assert(new_code != NULL); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp Tue May 20 11:38:23 2008 @@ -856,7 +856,7 @@ //assert(jlc->vt()->clss == VM_Global_State::loader_env->JavaLangClass_Class); assert(VM_Global_State::loader_env->vm_class_offset != 0); - Class **vm_class_ptr = (Class **)(((Byte *)jlc) + VM_Global_State::loader_env->vm_class_offset); + Class** vm_class_ptr = (Class**)(((U_8*)jlc) + VM_Global_State::loader_env->vm_class_offset); assert(vm_class_ptr != NULL); Class* clss = *vm_class_ptr; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Tue May 20 11:38:23 2008 @@ -917,7 +917,7 @@ assert(managed_object_is_java_lang_class(*jlc)); assert(env->vm_class_offset != 0); - Class** vm_class_ptr = (Class **)(((Byte *)(*jlc)) + env->vm_class_offset); + Class** vm_class_ptr = (Class **)(((U_8*)(*jlc)) + env->vm_class_offset); *vm_class_ptr = clss; } // set_struct_Class_field_in_java_lang_Class Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp Tue May 20 11:38:23 2008 @@ -342,13 +342,13 @@ void *Method::allocate_jit_info_block(size_t size, JIT *jit) { assert(size); // should be no need to allocate empty blocks - Byte* p_block = (Byte *) Alloc(size + sizeof(JIT **)); + U_8* p_block = (U_8*) Alloc(size + sizeof(JIT **)); // Store a pointer to the JIT before the JIT info block. *(JIT **) p_block = jit; - Byte* jit_info_block = p_block + sizeof(JIT **); - + U_8* jit_info_block = p_block + sizeof(JIT **); + CodeChunkInfo *jit_info = get_chunk_info_mt(jit, CodeChunkInfo::main_code_chunk_id); assert(jit_info != NULL); @@ -587,10 +587,10 @@ CodeChunkInfo *jit_info; for (jit_info = get_first_JIT_specific_info(); jit_info; jit_info = jit_info->_next) { if (jit_info->get_jit() == jit_to_be_notified) { - flush_hw_cache((Byte *)jit_info->get_code_block_addr(), jit_info->get_code_block_size()); + flush_hw_cache((U_8*)jit_info->get_code_block_addr(), jit_info->get_code_block_size()); } } - sync_i_cache(); + sync_i_cache(); do_mf(); #endif //_IPF_ } @@ -627,13 +627,13 @@ if(!len) { return; } - Byte *bc = _byte_codes; + U_8* bc = _byte_codes; Nop_Stack_State stack_state = NS_StackEmpty; if(verbose) { printf("=========== nop[%d]: %s.%s%s\n", len, get_class()->get_name()->bytes, get_name()->bytes, get_descriptor()->bytes); } for (unsigned idx = 0; idx < len; idx++) { - Byte b = bc[idx]; + U_8 b = bc[idx]; if(verbose) { printf("\tbc[%d]=%d, state=%d\n", idx, b, stack_state); } Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp Tue May 20 11:38:23 2008 @@ -575,7 +575,7 @@ // ? 20030428: This code should be elsewhere! unsigned field_offset = ((Field *) gid_throwable_traceinfo)->get_offset(); ManagedObject **field_addr = - (ManagedObject **) ((Byte *) exn + field_offset); + (ManagedObject **) ((U_8*) exn + field_offset); Vector_Handle stack_trace = (Vector_Handle) get_raw_reference_pointer(field_addr); if (stack_trace) { Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Tue May 20 11:38:23 2008 @@ -838,8 +838,8 @@ Slot::init(gc_heap_base_address(), gc_heap_ceiling_address()); // TODO: find another way to initialize the following. - vm_env->heap_base = (Byte *)gc_heap_base_address(); - vm_env->heap_end = (Byte *)gc_heap_ceiling_address(); + vm_env->heap_base = (U_8*)gc_heap_base_address(); + vm_env->heap_end = (U_8*)gc_heap_ceiling_address(); vm_env->managed_null = REF_MANAGED_NULL; // 20030404 This handshaking protocol isn't quite correct. It doesn't Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Tue May 20 11:38:23 2008 @@ -672,7 +672,7 @@ method->lock(); for (CodeChunkInfo* cci = method->get_first_JIT_specific_info(); cci; cci = cci->_next) { if (cci->get_jit() == jit) { - compile_flush_generated_code_block((Byte*)cci->get_code_block_addr(), cci->get_code_block_size()); + compile_flush_generated_code_block((U_8*)cci->get_code_block_addr(), cci->get_code_block_size()); // We assume the main chunk starts from entry point if (cci->get_id() == CodeChunkInfo::main_code_chunk_id) { method->set_code_addr(cci->get_code_block_addr()); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/native_overrides.cpp Tue May 20 11:38:23 2008 @@ -133,7 +133,7 @@ cs = lil_parse_onto_end(cs, "jc l1=0,fallback;"); // Class supports fast allocation, now use frontier allocation technique - size_t offset_gc_local = (Byte *)&(p_TLS_vmthread->_gc_private_information) - (Byte *)p_TLS_vmthread; + size_t offset_gc_local = (U_8*)&(p_TLS_vmthread->_gc_private_information) - (U_8*)p_TLS_vmthread; size_t offset_allocation_handle = env->Void_Class->get_offset_of_allocation_handle(); size_t offset_instance_data_size = env->Void_Class->get_offset_of_instance_data_size(); current_offset += (unsigned) offset_gc_local; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp Tue May 20 11:38:23 2008 @@ -121,9 +121,9 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - ManagedObject **field_addr = (ManagedObject **)(java_ref + offset); - ManagedObject *val = get_raw_reference_pointer(field_addr); + U_8* java_ref = (U_8*) h->object; + ManagedObject** field_addr = (ManagedObject**)(java_ref + offset); + ManagedObject* val = get_raw_reference_pointer(field_addr); ObjectHandle new_handle = NULL; if (val != NULL) { new_handle = oh_allocate_local_handle_from_jni(); @@ -165,7 +165,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; jboolean val = *(jboolean *)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -197,7 +197,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; jbyte val = *(jbyte *)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -231,7 +231,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; jchar val = *(jchar *)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -265,7 +265,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; jshort val = *(jshort *)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -299,7 +299,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; jint val = *(jint *)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -333,8 +333,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - jlong val = *(jlong *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jlong val = *(jlong*)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -367,8 +367,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - jfloat val = *(jfloat *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jfloat val = *(jfloat*)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -401,8 +401,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - jdouble val = *(jdouble *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jdouble val = *(jdouble*)(java_ref + offset); tmn_suspend_enable(); //---------------------------------^ @@ -446,7 +446,7 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; ManagedObject **field_addr = (ManagedObject **)(java_ref + offset); ManagedObject *val; @@ -488,8 +488,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jboolean *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jboolean*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -520,11 +520,11 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; if(vm_env->compact_fields) - *(jbyte *)(java_ref + offset) = value; + *(jbyte*)(java_ref + offset) = value; else - *(jint *)(java_ref + offset) = value; + *(jint*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -556,8 +556,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jchar *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jchar*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -590,11 +590,11 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; + U_8* java_ref = (U_8*)h->object; if (vm_env->compact_fields) - *(jshort *)(java_ref + offset) = value; + *(jshort*)(java_ref + offset) = value; else - *(jint *)(java_ref + offset) = value; + *(jint*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -626,8 +626,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jint *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jint*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -659,8 +659,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jlong *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jlong*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -691,8 +691,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jfloat *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jfloat*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } @@ -724,8 +724,8 @@ tmn_suspend_disable(); //---------------------------------v - Byte *java_ref = (Byte *)h->object; - *(jdouble *)(java_ref + offset) = value; + U_8* java_ref = (U_8*)h->object; + *(jdouble*)(java_ref + offset) = value; tmn_suspend_enable(); //---------------------------------^ } Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/lil_code_generator_ipf.cpp Tue May 20 11:38:23 2008 @@ -2146,7 +2146,7 @@ *stub_size = emitter.get_size(); NativeCodePtr buffer = allocate_memory(*stub_size, code_pool); emitter.copy((char*)buffer); - flush_hw_cache((Byte*)buffer, *stub_size); + flush_hw_cache((U_8*)buffer, *stub_size); sync_i_cache(); return buffer; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/ipf/stack_iterator_ipf.cpp Tue May 20 11:38:23 2008 @@ -342,7 +342,7 @@ size_t stub_size = emitter.get_size(); fp.addr = (NativeCodePtr)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_DEFAULT, CAA_Allocate); emitter.copy((char*)fp.addr); - flush_hw_cache((Byte*)fp.addr, stub_size); + flush_hw_cache((U_8*)fp.addr, stub_size); sync_i_cache(); DUMP_STUB(fp.addr, "transfer_control_stub (non-LIL)", stub_size); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics_common.cpp Tue May 20 11:38:23 2008 @@ -86,11 +86,11 @@ tmn_suspend_disable(); - Byte *java_ref = (Byte *)h->object; - ManagedObject **field_addr = (ManagedObject **)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + ManagedObject** field_addr = (ManagedObject**)(java_ref + offset); - ManagedObject *val = (v==NULL)?NULL:v->object; - ManagedObject *exp = (e==NULL)?NULL:e->object; + ManagedObject* val = (v==NULL)?NULL:v->object; + ManagedObject* exp = (e==NULL)?NULL:e->object; bool result; @@ -123,10 +123,10 @@ tmn_suspend_disable(); - Byte *java_ref = (Byte *)h->object; - jboolean *field_addr = (jboolean *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jboolean* field_addr = (jboolean*)(java_ref + offset); bool result = - (port_atomic_cas8((uint8 *)field_addr, (uint8)value, (uint8)expected) == (uint8)expected); + (port_atomic_cas8((uint8*)field_addr, (uint8)value, (uint8)expected) == (uint8)expected); tmn_suspend_enable(); return (jboolean)(result?JNI_TRUE:JNI_FALSE); @@ -142,10 +142,10 @@ tmn_suspend_disable(); - Byte *java_ref = (Byte *)h->object; - jint *field_addr = (jint *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jint* field_addr = (jint*)(java_ref + offset); bool result = - (apr_atomic_cas32((uint32 *)field_addr, (uint32)value, (uint32)expected) == (uint32)expected); + (apr_atomic_cas32((uint32*)field_addr, (uint32)value, (uint32)expected) == (uint32)expected); tmn_suspend_enable(); return (jboolean)(result?JNI_TRUE:JNI_FALSE); @@ -160,11 +160,11 @@ tmn_suspend_disable(); - Byte *java_ref = (Byte *)h->object; - jlong *field_addr = (jlong *)(java_ref + offset); + U_8* java_ref = (U_8*)h->object; + jlong* field_addr = (jlong*)(java_ref + offset); bool result = - (port_atomic_cas64((uint64 *)field_addr, (uint64)value, (uint64)expected) == (uint64)expected); + (port_atomic_cas64((uint64*)field_addr, (uint64)value, (uint64)expected) == (uint64)expected); tmn_suspend_enable(); return (jboolean)(result?JNI_TRUE:JNI_FALSE); Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Tue May 20 11:38:23 2008 @@ -224,8 +224,8 @@ Field *field = class_lookup_field_recursive(clazz, "vm_thread", "J"); offset = field->get_offset(); } - Byte *java_ref = (Byte *) thread_obj; - void **val = (void**)(java_ref + offset); + U_8* java_ref = (U_8*)thread_obj; + void** val = (void**)(java_ref + offset); hythread_suspend_enable(); @@ -244,8 +244,8 @@ Field *field = class_lookup_field_recursive(clazz, "vm_thread", "J"); offset = field->get_offset(); } - Byte *java_ref = (Byte *) thread_obj; - *(jlong *) (java_ref + offset) = (jlong) (POINTER_SIZE_INT) val; + U_8* java_ref = (U_8*)thread_obj; + *(jlong*)(java_ref + offset) = (jlong) (POINTER_SIZE_INT) val; hythread_suspend_enable(); } // jthread_set_tm_data Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp Tue May 20 11:38:23 2008 @@ -41,7 +41,7 @@ #include "dump.h" #include "vm_stats.h" -void compile_flush_generated_code_block(Byte*, size_t) { +void compile_flush_generated_code_block(U_8*, size_t) { // Nothing to do on EM64T } @@ -49,7 +49,7 @@ // Nothing to do on EM64T } -void patch_code_with_threads_suspended(Byte * UNREF code_block, Byte * UNREF new_code, size_t UNREF size) { +void patch_code_with_threads_suspended(U_8* UNREF code_block, U_8* UNREF new_code, size_t UNREF size) { DIE(("Not supported on EM64T currently")); } 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=658384&r1=658383&r2=658384&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 Tue May 20 11:38:23 2008 @@ -55,7 +55,7 @@ #include "vm_stats.h" #include "dump.h" -void compile_flush_generated_code_block(Byte*, size_t) { +void compile_flush_generated_code_block(U_8*, size_t) { // Nothing to do on IA32 } @@ -140,7 +140,7 @@ } } -void patch_code_with_threads_suspended(Byte * UNREF code_block, Byte * UNREF new_code, size_t UNREF size) { +void patch_code_with_threads_suspended(U_8* UNREF code_block, U_8* UNREF new_code, size_t UNREF size) { DIE(("Not supported on IA32 currently")); } Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp Tue May 20 11:38:23 2008 @@ -115,7 +115,7 @@ s = branch8(s, Condition_Z, Imm_Opnd(size_8, 50)); // Class supports fast allocation, now use frontier allocation technique - size_t offset_gc_local = (Byte *)&(p_TLS_vmthread->_gc_private_information) - (Byte *)p_TLS_vmthread; + size_t offset_gc_local = (U_8*)&(p_TLS_vmthread->_gc_private_information) - (U_8*)p_TLS_vmthread; size_t offset_allocation_handle = env->Void_Class->get_offset_of_allocation_handle(); size_t offset_instance_data_size = env->Void_Class->get_offset_of_instance_data_size(); current_offset += (unsigned) offset_gc_local; Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp Tue May 20 11:38:23 2008 @@ -81,10 +81,10 @@ void emit_system_currenttimemillis_override(Emitter_Handle eh, Method *method); void emit_readinternal_override(Emitter_Handle eh, Method *method); -void flush_hw_cache(Byte *addr, size_t len) +void flush_hw_cache(U_8* addr, size_t len) { for(unsigned int i = 0; i < len; i += 32) { - flush_cache_line((void *)&(addr[i])); + flush_cache_line((void*)&(addr[i])); } } //flush_hw_cache @@ -174,7 +174,7 @@ // (p3) [r8] = g3 // write vtable to the newly allocated object // (p3) [g1] = g4 // set new current value // (p3) return - size_t offset_gc_local = (Byte *)&(p_TLS_vmthread->_gc_private_information) - (Byte *)p_TLS_vmthread; + size_t offset_gc_local = (U_8*)&(p_TLS_vmthread->_gc_private_information) - (U_8*)p_TLS_vmthread; size_t offset_allocation_handle = env->Void_Class->get_offset_of_allocation_handle(); size_t offset_instance_data_size = env->Void_Class->get_offset_of_instance_data_size(); current_offset += (unsigned) offset_gc_local; @@ -320,7 +320,7 @@ /* END SUPPORT FOR STUB OVERRIDE CODE SEQUENCES */ -void compile_flush_generated_code_block(Byte* b, size_t sz) { +void compile_flush_generated_code_block(U_8* b, size_t sz) { flush_hw_cache(b, sz); } @@ -428,7 +428,7 @@ } } -void patch_code_with_threads_suspended(Byte *code_block, Byte *new_code, size_t size) { +void patch_code_with_threads_suspended(U_8* code_block, U_8* new_code, size_t size) { // Check that the code being modified is one or more complete bundles on IPF. assert((((size_t)code_block) % 16) == 0); // else did not start at a possible bundle address Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp?rev=658384&r1=658383&r2=658384&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp Tue May 20 11:38:23 2008 @@ -103,7 +103,7 @@ size_t stub_size = emitter.get_size(); void *stub = (void *)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_COLD, CAA_Allocate); emitter.copy((char *)stub); - flush_hw_cache((Byte *)stub, stub_size); + flush_hw_cache((U_8*)stub, stub_size); sync_i_cache(); addr = stub; return stub; @@ -130,7 +130,7 @@ size_t stub_size = emitter.get_size(); void *stub = (void *)malloc_fixed_code_for_jit(stub_size, DEFAULT_CODE_ALIGNMENT, CODE_BLOCK_HEAT_COLD, CAA_Allocate); emitter.copy((char *)stub); - flush_hw_cache((Byte *)stub, stub_size); + flush_hw_cache((U_8*)stub, stub_size); sync_i_cache(); return stub;