From cdc8cf8d55f519066445ce3f9e899d092824a98e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 12 Mar 2009 05:40:03 +0100
Subject: better readability for compiled VMPrg output

---
 runtime/vmop.c  | 51 ++++++++++++++++++++++++++++-----------------------
 runtime/vmprg.c |  2 +-
 2 files changed, 29 insertions(+), 24 deletions(-)

(limited to 'runtime')

diff --git a/runtime/vmop.c b/runtime/vmop.c
index 705acdf2..441dae6c 100644
--- a/runtime/vmop.c
+++ b/runtime/vmop.c
@@ -73,12 +73,17 @@ ENDobjDestruct(vmop)
 /* DebugPrint support for the vmop object */
 BEGINobjDebugPrint(vmop) /* be sure to specify the object type also in END and CODESTART macros! */
 	uchar *pOpcodeName;
+	cstr_t *pStrVar;
 CODESTARTobjDebugPrint(vmop)
 	vmopOpcode2Str(pThis, &pOpcodeName);
-	dbgoprint((obj_t*) pThis, "opcode: %d\t(%s), next %p, var in next line\n", (int) pThis->opcode, pOpcodeName,
-		  pThis->pNext);
-	if(pThis->operand.pVar != NULL)
-		var.DebugPrint(pThis->operand.pVar);
+	CHKiRet(rsCStrConstruct(&pStrVar));
+	CHKiRet(rsCStrFinish(&pStrVar));
+	if(pThis->operand.pVar != NULL) {
+		CHKiRet(var.Obj2Str(pThis->operand.pVar, pStrVar));
+	}
+	dbgoprint((obj_t*) pThis, "%.12s\t%s\n", pOpcodeName, rsCStrGetSzStrNoNULL(pStrVar));
+	rsCStrDestruct(&pStrVar);
+finalize_it:
 ENDobjDebugPrint(vmop)
 
 
@@ -158,37 +163,37 @@ vmopOpcode2Str(vmop_t *pThis, uchar **ppName)
 			*ppName = (uchar*) "and";
 			break;
 		case opcode_PLUS:
-			*ppName = (uchar*) "+";
+			*ppName = (uchar*) "add";
 			break;
 		case opcode_MINUS:
-			*ppName = (uchar*) "-";
+			*ppName = (uchar*) "sub";
 			break;
 		case opcode_TIMES:
-			*ppName = (uchar*) "*";
+			*ppName = (uchar*) "mul";
 			break;
 		case opcode_DIV:
-			*ppName = (uchar*) "/";
+			*ppName = (uchar*) "div";
 			break;
 		case opcode_MOD:
-			*ppName = (uchar*) "%";
+			*ppName = (uchar*) "mod";
 			break;
 		case opcode_NOT:
 			*ppName = (uchar*) "not";
 			break;
 		case opcode_CMP_EQ:
-			*ppName = (uchar*) "==";
+			*ppName = (uchar*) "cmp_==";
 			break;
 		case opcode_CMP_NEQ:
-			*ppName = (uchar*) "!=";
+			*ppName = (uchar*) "cmp_!=";
 			break;
 		case opcode_CMP_LT:
-			*ppName = (uchar*) "<";
+			*ppName = (uchar*) "cmp_<";
 			break;
 		case opcode_CMP_GT:
-			*ppName = (uchar*) ">";
+			*ppName = (uchar*) "cmp_>";
 			break;
 		case opcode_CMP_LTEQ:
-			*ppName = (uchar*) "<=";
+			*ppName = (uchar*) "cmp_<=";
 			break;
 		case opcode_CMP_CONTAINS:
 			*ppName = (uchar*) "contains";
@@ -197,31 +202,31 @@ vmopOpcode2Str(vmop_t *pThis, uchar **ppName)
 			*ppName = (uchar*) "startswith";
 			break;
 		case opcode_CMP_GTEQ:
-			*ppName = (uchar*) ">=";
+			*ppName = (uchar*) "cmp_>=";
 			break;
 		case opcode_PUSHSYSVAR:
-			*ppName = (uchar*) "PUSHSYSVAR";
+			*ppName = (uchar*) "push_sysvar";
 			break;
 		case opcode_PUSHMSGVAR:
-			*ppName = (uchar*) "PUSHMSGVAR";
+			*ppName = (uchar*) "push_msgvar";
 			break;
 		case opcode_PUSHCONSTANT:
-			*ppName = (uchar*) "PUSHCONSTANT";
+			*ppName = (uchar*) "push_const";
 			break;
 		case opcode_POP:
-			*ppName = (uchar*) "POP";
+			*ppName = (uchar*) "pop";
 			break;
 		case opcode_UNARY_MINUS:
-			*ppName = (uchar*) "UNARY_MINUS";
+			*ppName = (uchar*) "unary_minus";
 			break;
 		case opcode_STRADD:
-			*ppName = (uchar*) "STRADD";
+			*ppName = (uchar*) "strconcat";
 			break;
 		case opcode_FUNC_CALL:
-			*ppName = (uchar*) "FUNC_CALL";
+			*ppName = (uchar*) "func_call";
 			break;
 		default:
-			*ppName = (uchar*) "INVALID opcode";
+			*ppName = (uchar*) "!invalid_opcode!";
 			break;
 	}
 
diff --git a/runtime/vmprg.c b/runtime/vmprg.c
index 705e6948..75915025 100644
--- a/runtime/vmprg.c
+++ b/runtime/vmprg.c
@@ -74,7 +74,7 @@ ENDobjDestruct(vmprg)
 BEGINobjDebugPrint(vmprg) /* be sure to specify the object type also in END and CODESTART macros! */
 	vmop_t *pOp;
 CODESTARTobjDebugPrint(vmprg)
-	dbgoprint((obj_t*) pThis, "program contents:\n");
+	dbgoprint((obj_t*) pThis, "VM Program:\n");
 	for(pOp = pThis->vmopRoot ; pOp != NULL ; pOp = pOp->pNext) {
 		vmop.DebugPrint(pOp);
 	}
-- 
cgit