[dotgnu-pnet-commits] pnet ./ChangeLog engine/jitc_ptr.c

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Branch:         
Changes by:     Klaus Treichel <address@hidden> 06/03/08 21:09:00

Modified files:
        .              : ChangeLog 
        engine         : jitc_ptr.c 

Log message:
        Missed engine/jitc_ptr.c.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/ChangeLog.diff?tr1=1.3301&tr2=1.3302&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_ptr.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: pnet/ChangeLog
diff -u pnet/ChangeLog:1.3301 pnet/ChangeLog:1.3302
--- pnet/ChangeLog:1.3301       Wed Mar  8 21:03:52 2006
+++ pnet/ChangeLog      Wed Mar  8 21:09:00 2006
@@ -15,6 +15,9 @@
        jitc_locals.c and replace calls of jit_insn_check_null with calls of
        _ILJitCheckNull.
 
+       * engine/jitc_ptr.c: Replace calls of jit_insn_check_null with calls of
+       _ILJitCheckNull.
+
        * engine/jitc_setup.c: Use the new locals / parameter management in
        jitc_locals.c.
 
Index: pnet/engine/jitc_ptr.c
diff -u pnet/engine/jitc_ptr.c:1.5 pnet/engine/jitc_ptr.c:1.6
--- pnet/engine/jitc_ptr.c:1.5  Sun Feb 19 18:31:11 2006
+++ pnet/engine/jitc_ptr.c      Wed Mar  8 21:09:00 2006
@@ -21,14 +21,6 @@
 #ifdef IL_JITC_CODE
 
 /*
- * Validate the address.
- */
-static void ValidateAddress(ILJITCoder *coder, ILJitValue address)
-{
-       jit_insn_check_null(coder->jitFunction, address);
-}
-
-/*
  * Get the base pointer to the array data.
  */
 static ILJitValue GetArrayBase(ILJITCoder *coder, ILJitValue array)
@@ -83,7 +75,7 @@
        ILJitValue value;
        ILJitValue arrayBase;
 
-       ValidateAddress(coder, array);
+       _ILJitCheckNull(coder, array);
        length = GetArrayLength(coder, array);
        ValidateArrayIndex(coder, length, index);
        arrayBase = GetArrayBase(coder, array);
@@ -106,7 +98,7 @@
        ILJitValue arrayBase;
        ILJitType valueType = jit_value_get_type(value);
 
-       ValidateAddress(coder, array);
+       _ILJitCheckNull(coder, array);
        length = GetArrayLength(coder, array);
        ValidateArrayIndex(coder, length, index);
        arrayBase = GetArrayBase(coder, array);
@@ -128,7 +120,7 @@
        ILJitValue ptr = coder->jitStack[coder->stackTop - 1];
        ILJitValue value;
 
-       ValidateAddress(coder, ptr);
+       _ILJitCheckNull(coder, ptr);
        value = jit_insn_load_relative(coder->jitFunction, ptr, (jit_nint)0, 
type);
        coder->jitStack[coder->stackTop - 1] = 
                _ILJitValueConvertToStackType(coder->jitFunction, value);
@@ -143,7 +135,7 @@
        ILJitValue value  = coder->jitStack[coder->stackTop - 1];
        ILJitType valueType = jit_value_get_type(value);
 
-       ValidateAddress(coder, ptr);
+       _ILJitCheckNull(coder, ptr);
        if(valueType != type)
        {
                value = jit_insn_convert(coder->jitFunction, value, type, 0);
@@ -172,7 +164,7 @@
                        array = jitCoder->jitStack[jitCoder->stackTop - 2];
                        index = jitCoder->jitStack[jitCoder->stackTop - 1];
 
-                       ValidateAddress(jitCoder, array);
+                       _ILJitCheckNull(jitCoder, array);
                        len = GetArrayLength(jitCoder, array);
                        ValidateArrayIndex(jitCoder, array, index);
                        arrayBase = GetArrayBase(jitCoder, array);
@@ -493,7 +485,7 @@
        {
                /* Load from a pointer */
                address = jitCoder->jitStack[jitCoder->stackTop - 1];
-               ValidateAddress(jitCoder, address);
+               _ILJitCheckNull(jitCoder, address);
                jitCoder->jitStack[jitCoder->stackTop - 1] =
                        jit_insn_load_relative(jitCoder->jitFunction, address, 
(jit_nint)0,
                                                                   jitType);
@@ -504,7 +496,7 @@
                ILJitValue object = jitCoder->jitStack[jitCoder->stackTop - 1];;
 
                address = jitCoder->jitStack[jitCoder->stackTop - 2];
-               ValidateAddress(jitCoder, address);
+               _ILJitCheckNull(jitCoder, address);
                
                if(jit_value_get_type(object) != jitType)
                {
@@ -533,7 +525,7 @@
        ILJitValue array = jitCoder->jitStack[jitCoder->stackTop - 1];
        ILJitValue len;
 
-       ValidateAddress(jitCoder, array);
+       _ILJitCheckNull(jitCoder, array);
        len = GetArrayLength(jitCoder, array);
        jitCoder->jitStack[jitCoder->stackTop - 1] = 
                jit_insn_convert(jitCoder->jitFunction, len, 
_IL_JIT_TYPE_NUINT, 0);
@@ -594,8 +586,7 @@
 {
        ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
 
-       jit_insn_check_null(jitCoder->jitFunction,
-                                               
jitCoder->jitStack[jitCoder->stackTop - 1]);
+       _ILJitCheckNull(jitCoder, jitCoder->jitStack[jitCoder->stackTop - 1]);
 }
 
 #endif /* IL_JITC_CODE */