harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r557479 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363: context.h tpool.h ver_utils.h
Date Thu, 19 Jul 2007 03:47:49 GMT
Author: mloenko
Date: Wed Jul 18 20:47:48 2007
New Revision: 557479

URL: http://svn.apache.org/viewvc?view=rev&rev=557479
Log:
fixed compilation on gcc 4.x

Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/context.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/tpool.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/ver_utils.h

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/context.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/context.h?view=diff&rev=557479&r1=557478&r2=557479
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/context.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/context.h Wed Jul 18 20:47:48
2007
@@ -291,7 +291,7 @@
         void restore_workmap_after_jsr(Address jsr_target);
 
         //when we hit RET instruction we update the data for the given subroutine with current
derived types
-        vf_Result vf_Context_t::new_ret_vector_constraint(Address target_instr);
+        vf_Result new_ret_vector_constraint(Address target_instr);
 
         /////////////////////////////////////////////////////////////////////////////////////////////////////
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/tpool.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/tpool.h?view=diff&rev=557479&r1=557478&r2=557479
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/tpool.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/tpool.h Wed Jul 18 20:47:48 2007
@@ -104,13 +104,13 @@
         int ref_mustbe_assignable(SmConstant from, SmConstant to);
 
 
-        class_handler vf_TypePool::sm_get_handler(SmConstant type) {
+        class_handler sm_get_handler(SmConstant type) {
             unsigned index = type.getReferenceIdx();
             assert(index <= currentTypeId);
             return (validTypes+index)->cls;
         }
 
-        const char* vf_TypePool::sm_get_refname(SmConstant type) {
+        const char* sm_get_refname(SmConstant type) {
             unsigned index = type.getReferenceIdx();
             assert(index <= currentTypeId);
             return (validTypes+index)->name;
@@ -158,7 +158,7 @@
 
         //return SmConstant (known verification type) corresponding to java/lang/Throwable
         //returned value is cached
-        SmConstant vf_TypePool::sm_get_const_throwable() {
+        SmConstant sm_get_const_throwable() {
             return sm_get_const_existing("java/lang/Throwable", &const_throwable);
         }
 
@@ -170,7 +170,7 @@
 
         //return SmConstant (known verification type) corresponding to char[]
         //returned value is cached
-        SmConstant vf_TypePool::sm_get_const_arrayref_of_char() {
+        SmConstant sm_get_const_arrayref_of_char() {
             return sm_get_const_existing("[C", &const_arrayref_of_char);
         }
 
@@ -263,7 +263,7 @@
 
         //Get next free table entry index.
         //Reallocate table if out of free entries.
-        unsigned vf_TypePool::check_table() {
+        unsigned check_table() {
             if( currentTypeId == tableSize - 1) {
                 validTypes = (vf_ValidType*)tc_realloc(validTypes, tableSize+=tableIncr);
             }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/ver_utils.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/ver_utils.h?view=diff&rev=557479&r1=557478&r2=557479
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/ver_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/ver_utils.h Wed Jul 18 20:47:48
2007
@@ -396,7 +396,7 @@
         * @param key - key for hash function
         * @return Hash index relevant to key.
         */
-        unsigned vf_Hash::HashFunc( const char *key, int length ) {
+        unsigned HashFunc( const char *key, int length ) {
             unsigned result = 0;
 
             int idx = 0;



Mime
View raw message