Changeset 195 for src/VM/cil

Timestamp:

09/14/08 01:45:22 (4 months ago)

Author:

hak

Message:

Ver.0.91.0.137
- Added OSX/GCC support!
- Can compile in XCode 3.1/GCC 4.0.1 & Visual Studio 2005.
- Runs in OSX 10.5.4 & Windows XP/Vista
- Number::toString support a radix.
- BRFALSE bug fix
- Minor code clean up

Files:

• src/VM/cil/cilVMArgumentList.cpp (modified) (2 diffs)
• src/VM/cil/cilVMBind.cpp (modified) (1 diff)
• src/VM/cil/cilVMExceptionHandling.cpp (modified) (2 diffs)
• src/VM/cil/cilVMILPool.cpp (modified) (1 diff)
• src/VM/cil/cilVMObject.cpp (modified) (3 diffs)
• src/VM/cil/cilVMOperatorBrFalse.cpp (modified) (3 diffs)
• src/VM/cil/cilVMTemplate.cpp (modified) (1 diff)

src/VM/cil/cilVMArgumentList.cpp

@@ -246 +246 @@
-        VMOBJECTREF pCallee = createObject( m_ridFunctionObject );
-        pCallee->setCallProperty( pStack->ridMethod );
-
+
+
+
-
-        //Set caller proeperty
@@ -276 +278 @@
-                VMOBJECTREF pCallee = createObject( m_ridFunctionObject );
-                pCallee->setCallProperty( pStack->ridMethod );
-
-
-
+
+
+
+
+
-        }
-

src/VM/cil/cilVMBind.cpp

@@ -180 +180 @@
-        assert( iLength >= 0 );
-
+        CVariable varInt( iLength, OPERAND_FLAG_DONTENUM );
-        var.refObject->setProperty( STRING_INTERNAL_LENGTH,
-CVariable( iLength, OPERAND_FLAG_DONTENUM )
+varInt
-
-        //Store the ObjectRef to a static field

src/VM/cil/cilVMExceptionHandling.cpp

@@ -400 +400 @@
-        
-        if( pstrName != NULL )
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        //Push the ObjectRef to a eval stack
@@ -439 +440 @@
-        
-        if( pstrName != NULL )
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        //Push the ObjectRef to a eval stack

src/VM/cil/cilVMILPool.cpp

@@ -48 +48 @@
-}
-
+bool CCilVm::setILPool( const uint8_t* pILPool, const size_t size )
+{
+        if( m_status != VM_EXECUTE_INITIALIZING ) return false;
+        
+        ILFRAGMENTINFO ilInfo;
+        m_CurrentILPool = ilInfo;
+        
+        for( uint32_t i = 0; i < size; ++i )
+                m_CurrentILPool.ILPool.push_back( *pILPool++ );
+        
+        m_pCurrentInstruction = &m_CurrentILPool.ILPool[ 0 ];
+        
+        return true;
+}
-
-} //namespace CRI

src/VM/cil/cilVMObject.cpp

@@ -213 +213 @@
-        it = m_mapProperty.find( name );
-
-        OPERAND_TYPE op = (OPERAND_TYPE)OperandType( var.iOperandType );
-
-        if( it != m_mapProperty.end() )
-        {
@@ -239 +237 @@
-        hash_map< wstring, CVariable >::iterator it;
-        it = m_mapProperty.find( name );
-
-        OPERAND_TYPE op = (OPERAND_TYPE)OperandType( var.iOperandType );
-
-        if( it != m_mapProperty.end() )
@@ -296 +292 @@
-
-        assert( iLength >= 0 );
-var.refObject->setProperty( STRING_INTERNAL_LENGTH,
-               CVariable( iLength, OPERAND_FLAG_DONTENUM )
+CVariable varInt( iLength, OPERAND_FLAG_DONTENUM );
+var.refObject->setProperty( STRING_INTERNAL_LENGTH, varInt
-
-        //Store the ObjectRef to a static field

src/VM/cil/cilVMOperatorBrFalse.cpp

@@ -103 +103 @@
-        {
-        case OPERAND_INT:
-!
+=
-                break;
-        case OPERAND_INT64:
-!
+=
-                break;
-        case OPERAND_FLOAT:
-!
+=
-                break;
-        case OPERAND_DOUBLE:
-!
+=
-                break;
-        case OPERAND_STRING:
@@ -118 +118 @@
-                break;
-        case OPERAND_OBJECTREF:
-!
+=
-                break;
-        case OPERAND_UNDEFINED:
-        case OPERAND_NULL:
-        case OPERAND_NAN:
-fals
+tru
-                break;
-        case OPERAND_BOOLEAN:
@@ -132 +132 @@
-                break;
-        }
-        bTakeBranch = !bTakeBranch;
-        
-        if( bTakeBranch ) 
-        {

src/VM/cil/cilVMTemplate.cpp

@@ -18 +18 @@
-#include "stdafx.h"
-#include "CriScript.h"
-#include "msilVM.h"
-namespace cri {
-/***************************************************************************