[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] pnet ./ChangeLog engine/jitc_call.c engine/jitc...
|
From: |
Klaus Treichel |
|
Subject: |
[dotgnu-pnet-commits] pnet ./ChangeLog engine/jitc_call.c engine/jitc... |
|
Date: |
Wed, 18 Jan 2006 20:48:02 +0000 |
CVSROOT: /cvsroot/dotgnu-pnet
Module name: pnet
Branch:
Changes by: Klaus Treichel <address@hidden> 06/01/18 20:48:02
Modified files:
. : ChangeLog
engine : jitc_call.c jitc_obj.c jitc_setup.c jitc_var.c
Log message:
2006-01-18 Klaus Treichel <address@hidden>
* engine/jitc_call.c, engine/jitc_obj.c, engine/jitc_setup.c,
engine/jitc_var.c: Fix a bug in JITCoder_LoadThisField and add trace
output
in various coder functions. (can be activated with the -Z switch).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/ChangeLog.diff?tr1=1.3279&tr2=1.3280&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_call.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_obj.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_setup.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnet/engine/jitc_var.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: pnet/ChangeLog
diff -u pnet/ChangeLog:1.3279 pnet/ChangeLog:1.3280
--- pnet/ChangeLog:1.3279 Tue Jan 17 20:16:57 2006
+++ pnet/ChangeLog Wed Jan 18 20:48:01 2006
@@ -1,3 +1,9 @@
+2006-01-18 Klaus Treichel <address@hidden>
+
+ * engine/jitc_call.c, engine/jitc_obj.c, engine/jitc_setup.c,
+ engine/jitc_var.c: Fix a bug in JITCoder_LoadThisField and add trace
output
+ in various coder functions. (can be activated with the -Z switch).
+
2006-01-17 Klaus Treichel <address@hidden>
* engine/jitc_obj.c: Adjust evaluationstack in JITCoder_CopyObject with
-2
Index: pnet/engine/jitc_call.c
diff -u pnet/engine/jitc_call.c:1.5 pnet/engine/jitc_call.c:1.6
--- pnet/engine/jitc_call.c:1.5 Mon Jan 9 20:49:47 2006
+++ pnet/engine/jitc_call.c Wed Jan 18 20:48:01 2006
@@ -118,6 +118,17 @@
ILJitValue jitParams[argCount + 1];
ILJitValue returnValue;
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "CallMethod: %s.%s\n",
+ ILClass_Name(ILMethod_Owner(methodInfo)),
+ ILMethod_Name(methodInfo));
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Set the ILExecThread argument. */
jitParams[0] = jit_value_get_param(jitCoder->jitFunction, 0);
@@ -155,6 +166,17 @@
ILJitValue jitParams[argCount + 2];
ILJitValue returnValue;
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "CallCtor: %s.%s\n",
+ ILClass_Name(ILMethod_Owner(methodInfo)),
+ ILMethod_Name(methodInfo));
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Output a call to the static constructor */
_ILJitCallStaticConstructor(jitCoder, ILMethod_Owner(methodInfo), 1);
@@ -198,6 +220,17 @@
ILJitValue vtableIndex;
ILJitValue jitFunction;
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "CallVirtual: %s.%s\n",
+ ILClass_Name(ILMethod_Owner(methodInfo)),
+ ILMethod_Name(methodInfo));
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
if(!func)
{
signature = _ILJitCreateMethodSignature(jitCoder, methodInfo);
Index: pnet/engine/jitc_obj.c
diff -u pnet/engine/jitc_obj.c:1.7 pnet/engine/jitc_obj.c:1.8
--- pnet/engine/jitc_obj.c:1.7 Tue Jan 17 20:16:57 2006
+++ pnet/engine/jitc_obj.c Wed Jan 18 20:48:02 2006
@@ -210,6 +210,18 @@
ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
ILJitValue ptr = jitCoder->jitStack[jitCoder->stackTop - 1];
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadField: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jitCoder->jitStack[jitCoder->stackTop - 1] =
_ILJitLoadField(jitCoder, ptr, fieldType, field->offset, 1);
}
@@ -221,7 +233,20 @@
/* We need argNum + 1 because the ILExecThread is added as param 0 */
ILJitValue param = jit_value_get_param(jitCoder->jitFunction, 1);
- jitCoder->jitStack[jitCoder->stackTop] = param;
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadThisField: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
+ jitCoder->jitStack[jitCoder->stackTop] =
+ _ILJitLoadField(jitCoder, param, fieldType, field->offset, 1);
JITC_ADJUST(jitCoder, 1);
}
@@ -231,6 +256,18 @@
ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
ILJitValue ptr = _ILJitGetClassStaticArea(jitCoder->jitFunction,
field);
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadStaticField: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Output a call to the static constructor */
_ILJitCallStaticConstructor(jitCoder, ILField_Owner(field), 0);
@@ -246,6 +283,18 @@
ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
ILJitValue ptr = jitCoder->jitStack[jitCoder->stackTop - 1];
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadFieldAddr: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jitCoder->jitStack[jitCoder->stackTop - 1] =
_ILJitLoadFieldAddress(jitCoder, ptr, field->offset, 1);
}
@@ -257,6 +306,18 @@
ILJitValue ptr = _ILJitGetClassStaticArea(jitCoder->jitFunction,
field);
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadStaticFieldAddr: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Output a call to the static constructor */
_ILJitCallStaticConstructor(jitCoder, ILField_Owner(field), 0);
@@ -273,6 +334,18 @@
ILJitValue ptr = jitCoder->jitStack[jitCoder->stackTop - 2];
ILJitValue value = jitCoder->jitStack[jitCoder->stackTop - 1];
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "StoreField: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
_ILJitStoreField(jitCoder, ptr, value, fieldType, field->offset, 1);
JITC_ADJUST(jitCoder, -2);
}
@@ -285,6 +358,18 @@
field);
ILJitValue value = jitCoder->jitStack[jitCoder->stackTop - 1];
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "StoreStaticField: %s.%s at offset %i\n",
+ ILClass_Name(ILField_Owner(field)),
+ ILField_Name(field),
+ field->offset);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Output a call to the static constructor */
_ILJitCallStaticConstructor(jitCoder, ILField_Owner(field), 0);
Index: pnet/engine/jitc_setup.c
diff -u pnet/engine/jitc_setup.c:1.6 pnet/engine/jitc_setup.c:1.7
--- pnet/engine/jitc_setup.c:1.6 Mon Jan 9 20:49:47 2006
+++ pnet/engine/jitc_setup.c Wed Jan 18 20:48:02 2006
@@ -100,6 +100,17 @@
/* Record the current method. */
coder->currentMethod = method;
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (coder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "Setup: %s.%s\n",
+ ILClass_Name(ILMethod_Owner(method)),
+ ILMethod_Name(method));
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
/* Create the local variables. */
if(!_JITCreateLocals(coder, code->localVarSig))
{
Index: pnet/engine/jitc_var.c
diff -u pnet/engine/jitc_var.c:1.4 pnet/engine/jitc_var.c:1.5
--- pnet/engine/jitc_var.c:1.4 Fri Jan 6 17:38:56 2006
+++ pnet/engine/jitc_var.c Wed Jan 18 20:48:02 2006
@@ -32,6 +32,16 @@
ILJitValue newParam =
_ILJitValueConvertToStackType(jitCoder->jitFunction,
param);
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadArg: %i\n",
+ argNum);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jitCoder->jitStack[jitCoder->stackTop] = newParam;
JITC_ADJUST(jitCoder, 1);
}
@@ -44,6 +54,16 @@
ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
ILJitValue localValue = jitCoder->jitLocals[localNum];
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "LoadLocal: %i\n",
+ localNum);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jitCoder->jitStack[jitCoder->stackTop] =
_ILJitValueConvertToStackType(jitCoder->jitFunction,
localValue);
@@ -60,6 +80,16 @@
/* We need argNum + 1 because the ILExecThread is added as param 0 */
ILJitValue argValue = jit_value_get_param(jitCoder->jitFunction, argNum
+ 1);
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "StoreArg: %i\n",
+ argNum);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jit_insn_store(jitCoder->jitFunction, argValue,
jitCoder->jitStack[jitCoder->stackTop -
1]);
@@ -74,6 +104,16 @@
{
ILJITCoder *jitCoder = _ILCoderToILJITCoder(coder);
+#if !defined(IL_CONFIG_REDUCE_CODE) && !defined(IL_WITHOUT_TOOLS)
+ if (jitCoder->flags & IL_CODER_FLAG_STATS)
+ {
+ ILMutexLock(globalTraceMutex);
+ fprintf(stdout,
+ "StoreLocal: %i\n",
+ localNum);
+ ILMutexUnlock(globalTraceMutex);
+ }
+#endif
jit_insn_store(jitCoder->jitFunction, jitCoder->jitLocals[localNum],
jitCoder->jitStack[jitCoder->stackTop -
1]);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] pnet ./ChangeLog engine/jitc_call.c engine/jitc...,
Klaus Treichel <=