Commit: fe519622fb41bc1d1d04ca609f26d416bc6f6bde - chncpu (git)

Commit MetaInfo

• Revisión: fe519622fb41bc1d1d04ca609f26d416bc6f6bde (tree)
• Tiempo: 2014-07-07 23:06:45
• Autor: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

コードの整理。
wikiドキュメント生成機能は削除された。

Cambiar Resumen

• modified: chncpu.xcodeproj/project.pbxproj
• modified: chncpu/args.c
• modified: chncpu/chncpu.c
• modified: chncpu/chncpu.h
• add: chncpu/opcache.h
• modified: chncpu/opcode.c
• add: debug.c

Diferencia incremental

--- a/chncpu.xcodeproj/project.pbxproj
+++ b/chncpu.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		1786B0941956C18800FD4F7B /* label.c in Sources */ = {isa = PBXBuildFile; fileRef = 1786B0931956C18800FD4F7B /* label.c */; };
 		17DD55BB1967992200DA7D82 /* args.c in Sources */ = {isa = PBXBuildFile; fileRef = 17DD55BA1967992200DA7D82 /* args.c */; };
 		17E5092A1967F7B00091A22A /* src.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 17E509291967F7770091A22A /* src.txt */; };
+		17E50932196AD91D0091A22A /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 17E50931196AD91D0091A22A /* debug.c */; };
 		17F95C01194C8DA70064E1B6 /* bios.c in Sources */ = {isa = PBXBuildFile; fileRef = 17F95C00194C8DA70064E1B6 /* bios.c */; };
 /* End PBXBuildFile section */
 
@@ -42,6 +43,8 @@
 		1786B0931956C18800FD4F7B /* label.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = label.c; sourceTree = "<group>"; };
 		17DD55BA1967992200DA7D82 /* args.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = args.c; sourceTree = "<group>"; };
 		17E509291967F7770091A22A /* src.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = src.txt; sourceTree = "<group>"; };
+		17E50930196AD6BF0091A22A /* opcache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = opcache.h; sourceTree = "<group>"; };
+		17E50931196AD91D0091A22A /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../debug.c; sourceTree = "<group>"; };
 		17F95C00194C8DA70064E1B6 /* bios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bios.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -76,15 +79,17 @@
 		17478CF2193E2A4900293791 /* chncpu */ = {
 			isa = PBXGroup;
 			children = (
+				17478CFC193E2A7800293791 /* chncpu.h */,
 				17478CF3193E2A4900293791 /* chncpu.c */,
+				17E50931196AD91D0091A22A /* debug.c */,
 				17DD55BA1967992200DA7D82 /* args.c */,
-				17478CFC193E2A7800293791 /* chncpu.h */,
 				17478D00193F3D0000293791 /* ch4.c */,
 				17478D02193F586100293791 /* ch4.h */,
-				17478CFD193E2ADA00293791 /* test.hex */,
+				17E50930196AD6BF0091A22A /* opcache.h */,
 				17478D031940B66700293791 /* opcode.c */,
 				17F95C00194C8DA70064E1B6 /* bios.c */,
 				1786B0931956C18800FD4F7B /* label.c */,
+				17478CFD193E2ADA00293791 /* test.hex */,
 				17E509291967F7770091A22A /* src.txt */,
 			);
 			path = chncpu;
@@ -142,6 +147,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				1786B0941956C18800FD4F7B /* label.c in Sources */,
+				17E50932196AD91D0091A22A /* debug.c in Sources */,
 				17F95C01194C8DA70064E1B6 /* bios.c in Sources */,
 				17DD55BB1967992200DA7D82 /* args.c in Sources */,
 				17478D041940B66700293791 /* opcode.c in Sources */,

--- a/chncpu/args.c
+++ b/chncpu/args.c
@@ -31,7 +31,7 @@ CHNCPU_VMArgs *bindVMArgs(int argc, const char *argv[])
 			s = CHNCPU_VMArgs_GetNextAsString(argc, argv, &nextIndex);
 			for(;*s != '\0'; s++){
 				if(*s == 'i'){
-					args->VMFlags |= CHNCPU_VM_FLAG_PRINT_OPLIST;
+					args->VMFlags |= CHNCPU_VM_FLAG_PRINT_INFO;
 				} else{
 					printf("bindVMArgs: unknown flag %c.\n", *s);
 					argc = 0;

--- a/chncpu/chncpu.c
+++ b/chncpu/chncpu.c
@@ -16,8 +16,8 @@ int main(int argc, const char *argv[])
 	vmArgs = bindVMArgs(argc, argv);
 	env = CHNCPU_CreateRuntimeEnvironment(CHNCPU_CreateOpTableSet(), CHNCPU_CreateBIOS());
 	
-	if(vmArgs->VMFlags & CHNCPU_VM_FLAG_PRINT_OPLIST){
-		printOpTableWikiDoc(env);
+	if(vmArgs->VMFlags & CHNCPU_VM_FLAG_PRINT_INFO){
+		printf("chncpu, inspired by OSECPU-VM. \nCompiled at %s, %s.\n", __TIME__, __DATE__);
 		return 0;
 	}
     
@@ -34,18 +34,6 @@ int main(int argc, const char *argv[])
     return 0;
 }
 
-void printOpTableWikiDoc(CHNCPU_RuntimeEnvironment *env)
-{
-	int i;
-	
-	puts(", mnemonic, OpCode(Hex), OpCode(ch4_uint Hex), +!, +2, +3, +4, +5, +6, +7, code, type");
-	for(i = 0; i <= CHNCPU_OPECODE_MAX; i++){
-        if(env->opSet->docFuncTable[i]){
-			env->opSet->docFuncTable[i](i, stdout);
-		}
-    }
-}
-
 int decodeHexString(char *src0, char *src1, unsigned char *dst0, unsigned char *dst1)
 {
     // ASCII文字のみ対応
@@ -380,61 +368,6 @@ int CHNCPU_Execute(CHNCPU_RuntimeEnvironment *env)
     return count;
 }
 
-void CHNCPU_DumpAppBin(CHNCPU_RuntimeEnvironment *env)
-{
-    int i;
-    
-    for(i = 0; i < env->appbinsize; i++){
-        printf("%02X ", env->appbin0[i]);
-        if((i & 0xf) == 0xf){
-            putchar('\n');
-        }
-    }
-    if(((i - 1) & 0xf) != 0xf){
-        putchar('\n');
-    }
-}
-
-void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env)
-{
-    int i, regs = 0;
-    
-    puts(">>> Integer registers");
-    
-    for(i = 0; i < CHNCPU_NUMBER_OF_IREG; i++){
-        if(env->iRegBits[i]){
-            printf("R%02X = %10d = 0x%08X(%2d) ", i, env->iReg[i], env->iReg[i], env->iRegBits[i]);
-			putchar('\n');
-            regs++;
-        }
-    }
-    if(((regs - 1) & 0xF) != 0xF){
-        putchar('\n');
-    }
-}
-
-void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env)
-{
-    int i, regs = 0;
-    
-    puts(">>> Pointer registers");
-    
-    for(i = 0; i < CHNCPU_NUMBER_OF_PREG; i++){
-        if(env->pReg[i].type != CHNCPU_PType_Undefined){
-			if(env->pReg[i].mindex != CHNCPU_MemoryIndex_INVALID){
-				printf("P%02X: Type:%2X  mem[%d][%d]", i, env->pReg[i].type, env->pReg[i].mindex, env->pReg[i].pindex);
-			} else{
-				printf("P%02X: Type:%2X  %s[%d]", i, env->pReg[i].type, CHNCPU_Op_DATA_GetFilePath(env->pReg[i].opTag), env->pReg[i].pindex);
-			}
-			putchar('\n');
-            regs++;
-        }
-    }
-    if(((regs - 1) & 0xF) != 0xF){
-        putchar('\n');
-    }
-}
-
 int CHNCPU_CHK_IsAvailableBits(CHNCPU_RuntimeEnvironment *env, ch4_uint bits)
 {
     if(bits > 32){

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -22,7 +22,7 @@
 #define DEBUG_PRINT_OP_EXECUTING			0
 
 // VM flags
-#define CHNCPU_VM_FLAG_PRINT_OPLIST     0x01
+#define CHNCPU_VM_FLAG_PRINT_INFO     0x01
 
 
 // Settings
@@ -110,7 +110,6 @@ struct _CHNCPU_OP_TABLE_SET {
     int (*bindFuncTable[CHNCPU_OPECODE_MAX + 1])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
     int (*execFuncTable[CHNCPU_OPECODE_MAX + 1])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
     int (*printFuncTable[CHNCPU_OPECODE_MAX + 1])(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-    int (*docFuncTable[CHNCPU_OPECODE_MAX + 1])(int opCode, FILE *file);
 };
 
 struct _CHNCPU_LABEL_TAG {
@@ -166,15 +165,11 @@ struct _CHNCPU_VM_ARGS {
 
 
 // @chncpu.c
-void printOpTableWikiDoc(CHNCPU_RuntimeEnvironment *env);
 int decodeHexString(char *src0, char *src1, unsigned char *dst0, unsigned char *dst1);
 CHNCPU_RuntimeEnvironment *CHNCPU_CreateRuntimeEnvironment(CHNCPU_OpTableSet *opSet, CHNCPU_BIOS *bios);
 int CHNCPU_LoadBinaryFromHexStringFilePath(CHNCPU_RuntimeEnvironment *env, const char *path);
 int CHNCPU_PrepareBinaryForExecution(CHNCPU_RuntimeEnvironment *env);
 int CHNCPU_Execute(CHNCPU_RuntimeEnvironment *env);
-void CHNCPU_DumpAppBin(CHNCPU_RuntimeEnvironment *env);
-void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env);
-void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env);
 int CHNCPU_CHK_IsAvailableBits(CHNCPU_RuntimeEnvironment *env, ch4_uint bits);
 int CHNCPU_AdjustValueForBit(CHNCPU_RuntimeEnvironment *env, int *value, ch4_uint bit, int prefix);
 
@@ -192,53 +187,42 @@ int CHNCPU_VMArgs_GetNextAsSignedHexValue(int argc, const char *argv[], int *nex
 CHNCPU_OpTableSet *CHNCPU_CreateOpTableSet(void);
 int CHNCPU_Op_Init(CHNCPU_OpTableSet *env);
 //
-int CHNCPU_Op_NOP_PrintWikiDoc(int opCode, FILE *file);
-//
 int CHNCPU_Op_LB_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_LB_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_LB_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_LB_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_LIMM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_LIMM_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_PLIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_PLIMM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_PLIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_PLIMM_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_CND_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_CND_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_CND_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_CND_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_CALLBIOS_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_CALLBIOS_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_CALLBIOS_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_CALLBIOS_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_LMEM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_LMEM_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_LMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_LMEM_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_TernaryRegBitwise_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryRegArithmetic_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_TernaryReg_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_CompareIReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_CompareIReg_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_CompareIReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_CompareIReg_PrintWikiDoc(int opCode, FILE *file);
 //
 int CHNCPU_Op_DATA_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix);
 int CHNCPU_Op_DATA_Execute(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op);
 int CHNCPU_Op_DATA_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file);
-int CHNCPU_Op_DATA_PrintWikiDoc(int opCode, FILE *file);
 CHNCPU_OpTag *CHNCPU_Op_DATA_CreateDataFromFileAsPType(const char dataPath[], ch4_sint pType);
 int CHNCPU_Op_DATA_WriteRawDataToFile(CHNCPU_OpTag *op, const char dataPath[], int dataCount, int dataType);
 int CHNCPU_Op_DATA_ReadAtIndex(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, int index);
@@ -260,4 +244,9 @@ CHNCPU_LabelSet *CHNCPU_CreateLabelSet(void);
 int CHNCPU_Label_Add(CHNCPU_LabelSet *lbSet, int mindex, ch4_uint labelID, ch4_uint opt, ch4_sint pType);
 CHNCPU_LabelTag *CHNCPU_Label_GetTagFromLabelID(CHNCPU_LabelSet *lbSet, int labelID);
 
+// @debug.c
+void CHNCPU_DumpAppBin(CHNCPU_RuntimeEnvironment *env);
+void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env);
+void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env);
+
 #endif

--- /dev/null
+++ b/chncpu/opcache.h
@@ -0,0 +1,164 @@
+//
+//  opcache.h
+//  chncpu
+//
+//  Created by 西田　耀 on 2014/07/07.
+//  Copyright (c) 2014年 CHNOSProject. All rights reserved.
+//
+
+#ifndef chncpu_opcache_h
+#define chncpu_opcache_h
+
+#include "chncpu.h"
+
+//
+// 00 NOP (not cached)
+//
+// 00
+//
+
+
+//
+// 01 LB
+//
+// 01 labelID opt
+//
+typedef struct _CHNCPU_OP_CACHE_LB CHNCPU_OpCache_LB;
+struct _CHNCPU_OP_CACHE_LB {
+    ch4_uint labelID;
+    ch4_uint opt;
+};
+
+//
+// 02 LIMM
+//
+// 02 (sint)imm r bit
+//
+typedef struct _CHNCPU_OP_CACHE_LIMM CHNCPU_OpCache_LIMM;
+struct _CHNCPU_OP_CACHE_LIMM {
+    ch4_sint imm;
+    ch4_uint r;
+    ch4_uint bit;
+};
+
+//
+// 03 PLIMM
+//
+// 03 labelID p
+//
+typedef struct _CHNCPU_OP_CACHE_PLIMM CHNCPU_OpCache_PLIMM;
+struct _CHNCPU_OP_CACHE_PLIMM {
+    ch4_uint labelID;
+    ch4_uint r;
+};
+
+//
+// 04 CND
+//
+// 04 r
+//
+typedef struct _CHNCPU_OP_CACHE_CND CHNCPU_OpCache_CND;
+struct _CHNCPU_OP_CACHE_CND {
+    ch4_uint r;
+};
+
+//
+// 05 CALLBIOS
+//
+// 05 fid ...
+//
+
+//
+// 08 LMEM
+//
+// p (sint)pType (sint)pDiff rDst bitDst
+//
+typedef struct _CHNCPU_OP_CACHE_LMEM CHNCPU_OpCache_LMEM;
+struct _CHNCPU_OP_CACHE_LMEM {
+    ch4_uint p;
+    ch4_sint pType;
+	ch4_sint pDiff;
+	ch4_uint r;
+	ch4_uint bitDst;
+};
+
+//
+// 10-12, 14-16, 18-1B Ternary Register Operation
+//
+// opCode r1 r2 r0 bit
+//
+//	Bitwise
+//		10 CP/OR	r0 = r1 | r2;	(CP: r0 = r1)
+//		11 XOR		r0 = r1 ^ r2;
+//		12 AND		r0 = r1 & r2;
+//
+//	Arithmetic
+//		14 ADD		r0 = r1 + r2;
+//		15 SUB		r0 = r1 - r2;
+//		16 MUL		r0 = r1 * r2;
+//		18 SHL		r0 = r1 << r2;
+//		19 SAR		r0 = r1 >> r2;
+//		1A DIV		r0 = r1 / r2;
+//		1B MOD		r0 = r1 % r2;
+//
+typedef struct _CHNCPU_OP_CACHE_TERNARY_REG CHNCPU_OpCache_TernaryReg;
+struct _CHNCPU_OP_CACHE_TERNARY_REG {
+    ch4_uint r0;
+    ch4_uint r1;
+    ch4_uint r2;
+	ch4_uint bit;
+	unsigned int prefix;
+};
+
+//
+// 20-27 Compare Integer Register Operation
+//
+// opCode r1 r2 bitCmp r0 bitDst
+//
+//		20 CMPE		r0 = (r1 == r2)	? -1 : 0;
+//		21 CMPNE	r0 = (r1 != r2)	? -1 : 0;
+//		22 CMPL		r0 = (r1 < r2)	? -1 : 0;
+//		23 CMPGE	r0 = (r1 >= r2) ? -1 : 0;
+//		24 CMPLE	r0 = (r1 <= r2) ? -1 : 0;
+//		25 CMPG		r0 = (r1 > r2)	? -1 : 0;
+//		26 TSTZ		((r1 & r2) == 0) ? -1 : 0;
+//		27 TSTNZ	((r1 & r2) != 0) ? -1 : 0;
+//
+
+typedef struct _CHNCPU_OP_CACHE_COMPARE_IREG CHNCPU_OpCache_CompareIReg;
+struct _CHNCPU_OP_CACHE_COMPARE_IREG {
+    ch4_uint rSrc1;
+    ch4_uint rSrc2;
+    ch4_uint bitDiff;
+	ch4_uint rDst;
+	ch4_uint bitDst;
+	unsigned int prefix;
+};
+
+
+//
+// 2E DATA
+//
+// 2E labelID labelOpt (sint)dType dCount (rawData...)
+//
+typedef struct _CHNCPU_OP_CACHE_DATA CHNCPU_OpCache_DATA;
+struct _CHNCPU_OP_CACHE_DATA {
+    ch4_uint labelID;
+    ch4_uint labelOpt;
+	ch4_sint dataType;
+	ch4_uint dataCount;
+	void *rawData;
+	//
+	int rawDataByteSize;
+	const char *filePath;
+};
+
+//
+// 2F Prefix (not cached)
+//
+// 2F n
+//
+
+
+
+#endif

--- a/chncpu/opcode.c
+++ b/chncpu/opcode.c
@@ -7,6 +7,7 @@
 //
 
 #include "chncpu.h"
+#include "opcache.h"
 
 CHNCPU_OpTableSet *CHNCPU_CreateOpTableSet(void)
 {
@@ -32,107 +33,72 @@ int CHNCPU_Op_Init(CHNCPU_OpTableSet *opSet)
         opSet->bindFuncTable[i] = NULL;
 		opSet->execFuncTable[i] = NULL;
 		opSet->printFuncTable[i] = NULL;
-		opSet->docFuncTable[i] = NULL;
     }
-	
-	// NOP
-	opSet->docFuncTable[0x00] = CHNCPU_Op_NOP_PrintWikiDoc;
-	
+		
 	// LB
 	opSet->bindFuncTable[0x01] = CHNCPU_Op_LB_BindOperand;
 	opSet->execFuncTable[0x01] = CHNCPU_Op_LB_Execute;
 	opSet->printFuncTable[0x01] = CHNCPU_Op_LB_PrintCode;
-	opSet->docFuncTable[0x01] = CHNCPU_Op_LB_PrintWikiDoc;
 	
 	// LIMM
     opSet->bindFuncTable[0x02] = CHNCPU_Op_LIMM_BindOperand;
 	opSet->execFuncTable[0x02] = CHNCPU_Op_LIMM_Execute;
 	opSet->printFuncTable[0x02] = CHNCPU_Op_LIMM_PrintCode;
-	opSet->docFuncTable[0x02] = CHNCPU_Op_LIMM_PrintWikiDoc;
 	
 	// PLIMM
     opSet->bindFuncTable[0x03] = CHNCPU_Op_PLIMM_BindOperand;
 	opSet->execFuncTable[0x03] = CHNCPU_Op_PLIMM_Execute;
 	opSet->printFuncTable[0x03] = CHNCPU_Op_PLIMM_PrintCode;
-	opSet->docFuncTable[0x03] = CHNCPU_Op_PLIMM_PrintWikiDoc;
 	
 	// CND
     opSet->bindFuncTable[0x04] = CHNCPU_Op_CND_BindOperand;
 	opSet->execFuncTable[0x04] = CHNCPU_Op_CND_Execute;
 	opSet->printFuncTable[0x04] = CHNCPU_Op_CND_PrintCode;
-	opSet->docFuncTable[0x04] = CHNCPU_Op_CND_PrintWikiDoc;
 	
 	// CALLBIOS
 	opSet->bindFuncTable[0x05] = CHNCPU_Op_CALLBIOS_BindOperand;
 	opSet->execFuncTable[0x05] = CHNCPU_Op_CALLBIOS_Execute;
 	opSet->printFuncTable[0x05] = CHNCPU_Op_CALLBIOS_PrintCode;
-	opSet->docFuncTable[0x05] = CHNCPU_Op_CALLBIOS_PrintWikiDoc;
 	
 	// LMEM
 	opSet->bindFuncTable[0x08] = CHNCPU_Op_LMEM_BindOperand;
 	opSet->execFuncTable[0x08] = CHNCPU_Op_LMEM_Execute;
 	opSet->printFuncTable[0x08] = CHNCPU_Op_LMEM_PrintCode;
-	opSet->docFuncTable[0x08] = CHNCPU_Op_LMEM_PrintWikiDoc;
 	
 	// TernaryRegBitwise
 	for(i = 0x10; i <= 0x12; i++){
 		opSet->bindFuncTable[i] = CHNCPU_Op_TernaryReg_BindOperand;
 		opSet->execFuncTable[i] = CHNCPU_Op_TernaryRegBitwise_Execute;
 		opSet->printFuncTable[i] = CHNCPU_Op_TernaryReg_PrintCode;
-		opSet->docFuncTable[i] = CHNCPU_Op_TernaryReg_PrintWikiDoc;
 	}
 	// TernaryRegArithmetic
 	for(i = 0x14; i <= 0x16; i++){
 		opSet->bindFuncTable[i] = CHNCPU_Op_TernaryReg_BindOperand;
 		opSet->execFuncTable[i] = CHNCPU_Op_TernaryRegArithmetic_Execute;
 		opSet->printFuncTable[i] = CHNCPU_Op_TernaryReg_PrintCode;
-		opSet->docFuncTable[i] = CHNCPU_Op_TernaryReg_PrintWikiDoc;
 	}
 	for(i = 0x18; i <= 0x1B; i++){
 		opSet->bindFuncTable[i] = CHNCPU_Op_TernaryReg_BindOperand;
 		opSet->execFuncTable[i] = CHNCPU_Op_TernaryRegArithmetic_Execute;
 		opSet->printFuncTable[i] = CHNCPU_Op_TernaryReg_PrintCode;
-		opSet->docFuncTable[i] = CHNCPU_Op_TernaryReg_PrintWikiDoc;
 	}
 	// CompareIReg
 	for(i = 0x20; i <= 0x27; i++){
 		opSet->bindFuncTable[i] = CHNCPU_Op_CompareIReg_BindOperand;
 		opSet->execFuncTable[i] = CHNCPU_Op_CompareIReg_Execute;
 		opSet->printFuncTable[i] = CHNCPU_Op_CompareIReg_PrintCode;
-		opSet->docFuncTable[i] = CHNCPU_Op_CompareIReg_PrintWikiDoc;
 	}
 	// DATA
 	opSet->bindFuncTable[0x2E] = CHNCPU_Op_DATA_BindOperand;
 	opSet->execFuncTable[0x2E] = CHNCPU_Op_DATA_Execute;
 	opSet->printFuncTable[0x2E] = CHNCPU_Op_DATA_PrintCode;
-	opSet->docFuncTable[0x2E] = CHNCPU_Op_DATA_PrintWikiDoc;
-	// Prefix2F
-	opSet->docFuncTable[0x2f] = CHNCPU_Op_Prefix2F_PrintWikiDoc;
 	return 0;
 }
 
 //
-// 00 NOP
-//
-int CHNCPU_Op_NOP_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"NOP",
-			0x00, 0x00,
-			"", "", "", "", "", "", "",
-			"No operation", "");
-	
-    return 0;
-}
-
-//
 // 01 LB
 //
-typedef struct _CHNCPU_OP_CACHE_LB CHNCPU_OpCache_LB;
-struct _CHNCPU_OP_CACHE_LB {
-    ch4_uint labelID;
-    ch4_uint opt;
-};
+
 int CHNCPU_Op_LB_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_LB *opCache;
@@ -175,27 +141,10 @@ int CHNCPU_Op_LB_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FIL
     return 0;
 }
 
-int CHNCPU_Op_LB_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"LB",
-			0x01, 0x01,
-			"labelID", "opt", "", "", "", "", "",
-			"#labelID;", "");
-	
-    return 0;
-}
-
 //
 // 02 LIMM
 //
 
-typedef struct _CHNCPU_OP_CACHE_LIMM CHNCPU_OpCache_LIMM;
-struct _CHNCPU_OP_CACHE_LIMM {
-    ch4_sint imm;
-    ch4_uint r;
-    ch4_uint bit;
-};
 int CHNCPU_Op_LIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_LIMM *opCache;
@@ -251,26 +200,9 @@ int CHNCPU_Op_LIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
     return 0;
 }
 
-int CHNCPU_Op_LIMM_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"LIMM",
-			0x02, 0x02,
-			"(sint)imm", "r", "bit", "", "", "", "",
-			"reg = imm;", "");
-	
-    return 0;
-}
-
 //
 // 03 PLIMM
 //
-
-typedef struct _CHNCPU_OP_CACHE_PLIMM CHNCPU_OpCache_PLIMM;
-struct _CHNCPU_OP_CACHE_PLIMM {
-    ch4_uint labelID;
-    ch4_uint r;
-};
 int CHNCPU_Op_PLIMM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_PLIMM *opCache;
@@ -331,25 +263,9 @@ int CHNCPU_Op_PLIMM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op,
     return 0;
 }
 
-int CHNCPU_Op_PLIMM_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"PLIMM",
-			0x03, 0x03,
-			"labelID", "p", "", "", "", "", "",
-			"p = #labelID;", "");
-	
-    return 0;
-}
-
 //
 // 04 CND
 //
-
-typedef struct _CHNCPU_OP_CACHE_CND CHNCPU_OpCache_CND;
-struct _CHNCPU_OP_CACHE_CND {
-    ch4_uint r;
-};
 int CHNCPU_Op_CND_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_CND *opCache;
@@ -392,17 +308,6 @@ int CHNCPU_Op_CND_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FI
     return 0;
 }
 
-int CHNCPU_Op_CND_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"CND",
-			0x04, 0x04,
-			"r", "", "", "", "", "", "",
-			"if((reg0R & 1) == 0){ skip nextOp; }", "Prefix");
-	
-    return 0;
-}
-
 //
 // 05 CALLBIOS
 //
@@ -464,29 +369,9 @@ int CHNCPU_Op_CALLBIOS_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *o
     return 0;
 }
 
-int CHNCPU_Op_CALLBIOS_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"CALLBIOS",
-			0x05, 0x05,
-			"fid", "...", "", "", "", "", "",
-			"", "");
-	
-    return 0;
-}
-
 //
 // 08 LMEM
 //
-
-typedef struct _CHNCPU_OP_CACHE_LMEM CHNCPU_OpCache_LMEM;
-struct _CHNCPU_OP_CACHE_LMEM {
-    ch4_uint p;
-    ch4_sint pType;
-	ch4_sint pDiff;
-	ch4_uint r;
-	ch4_uint bitDst;
-};
 int CHNCPU_Op_LMEM_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_LMEM *opCache;
@@ -553,43 +438,10 @@ int CHNCPU_Op_LMEM_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 	
     return 0;
 }
-int CHNCPU_Op_LMEM_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"LMEM",
-			0x08, 0x08 + 0x80,
-			"p", "(sint)pType", "(sint)pDiff", "r", "bitDst", "", "",
-			"", "");
-	
-    return 0;
-}
 
 //
 // Ternary Register Operation
 //
-
-//	Bitwise
-//		10 CP/OR
-//		11 XOR
-//		12 AND
-//
-//	Arithmetic
-//		14 ADD
-//		15 SUB
-//		16 MUL
-//		18 SHL
-//		19 SAR
-//		1A DIV
-//		1B MOD
-
-typedef struct _CHNCPU_OP_CACHE_TERNARY_REG CHNCPU_OpCache_TernaryReg;
-struct _CHNCPU_OP_CACHE_TERNARY_REG {
-    ch4_uint r0;
-    ch4_uint r1;
-    ch4_uint r2;
-	ch4_uint bit;
-	unsigned int prefix;
-};
 int CHNCPU_Op_TernaryReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_TernaryReg *opCache;
@@ -714,22 +566,6 @@ char *CHNCPU_Op_TernaryReg_MnemonicList0[12] = {
 	"MOD"
 };
 
-char *CHNCPU_Op_TernaryReg_CodeList0[12] = {
-	// 10 - 1B
-	"r0 = r1 | r2;",
-	"r0 = r1 ^ r2;",
-	"r0 = r1 & r2;",
-	"",
-	"r0 = r1 + r2;",
-	"r0 = r1 - r2;",
-	"r0 = r1 * r2;",
-	"",
-	"r0 = r1 << r2;",
-	"r0 = r1 >> r2;",
-	"r0 = r1 / r2;",
-	"r0 = r1 % r2;"
-};
-
 int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
 {
     CHNCPU_OpCache_TernaryReg *opCache;
@@ -750,47 +586,9 @@ int CHNCPU_Op_TernaryReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag
     return 0;
 }
 
-int CHNCPU_Op_TernaryReg_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			CHNCPU_Op_TernaryReg_MnemonicList0[opCode - 0x10],
-			opCode, opCode + 0x80,
-			"r1", "r2", "r0", "bit", "", "", "",
-			CHNCPU_Op_TernaryReg_CodeList0[opCode - 0x10], "");
-	
-	if(opCode == 0x10){
-		fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-				"CP",
-				opCode, opCode + 0x80,
-				"r1", "r1", "r0", "bit", "", "", "",
-				"r0 = r1", "");
-	}
-	
-    return 0;
-}
-
 //
 // Compare Integer Register Operation
 //
-
-//		20 CMPE
-//		21 CMPNE
-//		22 CMPL
-//		23 CMPGE
-//		24 CMPLE
-//		25 CMPG
-//		26 TSTZ
-//		27 TSTNZ
-
-typedef struct _CHNCPU_OP_CACHE_COMPARE_IREG CHNCPU_OpCache_CompareIReg;
-struct _CHNCPU_OP_CACHE_COMPARE_IREG {
-    ch4_uint rSrc1;
-    ch4_uint rSrc2;
-    ch4_uint bitDiff;
-	ch4_uint rDst;
-	ch4_uint bitDst;
-	unsigned int prefix;
-};
 int CHNCPU_Op_CompareIReg_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_CompareIReg *opCache;
@@ -890,19 +688,6 @@ char *CHNCPU_Op_CompareIReg_MnemonicList0[8] = {
 	"TSTNZ",
 };
 
-char *CHNCPU_Op_CompareIReg_CodeList0[8] = {
-	// 20-27
-	"r0 = (r1 == r2) ? -1 : 0;",
-	"r0 = (r1 != r2) ? -1 : 0;",
-	"r0 = (r1 < r2) ? -1 : 0;",
-	"r0 = (r1 >= r2) ? -1 : 0;",
-	"r0 = (r1 <= r2) ? -1 : 0;",
-	"r0 = (r1 > r2) ? -1 : 0;",
-	"r0 = ((r1 & r2) == 0) ? -1 : 0;",
-	"r0 = ((r1 & r2) != 0) ? -1 : 0;",
-};
-
-
 int CHNCPU_Op_CompareIReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, FILE *file)
 {
     CHNCPU_OpCache_CompareIReg *opCache;
@@ -920,31 +705,9 @@ int CHNCPU_Op_CompareIReg_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag
     return 0;
 }
 
-int CHNCPU_Op_CompareIReg_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			CHNCPU_Op_CompareIReg_MnemonicList0[opCode - 0x20],
-			opCode, opCode + 0x80,
-			"r1", "r2", "bitDiff", "r0", "bitDst", "", "",
-			CHNCPU_Op_CompareIReg_CodeList0[opCode - 0x20], "");
-	
-    return 0;
-}
-
 //
 // 2E DATA
 //
-typedef struct _CHNCPU_OP_CACHE_DATA CHNCPU_OpCache_DATA;
-struct _CHNCPU_OP_CACHE_DATA {
-    ch4_uint labelID;
-    ch4_uint labelOpt;
-	ch4_sint dataType;
-	ch4_uint dataCount;
-	void *rawData;
-	//
-	int rawDataByteSize;
-	const char *filePath;
-};
 int CHNCPU_Op_DATA_BindOperand(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, unsigned int prefix)
 {
     CHNCPU_OpCache_DATA *opCache;
@@ -1020,16 +783,6 @@ int CHNCPU_Op_DATA_PrintCode(CHNCPU_RuntimeEnvironment *env, CHNCPU_OpTag *op, F
 	
     return 0;
 }
-int CHNCPU_Op_DATA_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"DATA",
-			0x2E, 0x2E + 0x80,
-			"labelID", "labelOpt", "(sint)dataType", "dataCount", "(rawData)...", "", "",
-			"", "");
-	
-    return 0;
-}
 CHNCPU_OpTag *CHNCPU_Op_DATA_CreateDataFromFileAsPType(const char dataPath[], ch4_sint pType)
 {
 	FILE *fp;
@@ -1174,19 +927,3 @@ const char *CHNCPU_Op_DATA_GetFilePath(CHNCPU_OpTag *op)
 	return ((CHNCPU_OpCache_DATA *)op->opCache)->filePath;
 }
 
-//
-// Prefix2F
-//
-
-int CHNCPU_Op_Prefix2F_PrintWikiDoc(int opCode, FILE *file)
-{
-    fprintf(file, ", %s, %02X, %X, %s, %s, %s, %s, %s, %s, %s, %s, %s\n",
-			"Prefix2F-0",
-			0x2F, 0x2F + 0x80,
-			"0", "", "", "", "", "", "",
-			"DISABLE_BOUND_CHECK;", "");
-	
-    return 0;
-}
-
-

--- /dev/null
+++ b/debug.c
@@ -0,0 +1,64 @@
+//
+//  debug.c
+//  chncpu
+//
+//  Created by 西田　耀 on 2014/07/07.
+//  Copyright (c) 2014年 CHNOSProject. All rights reserved.
+//
+
+#include "chncpu.h"
+
+void CHNCPU_DumpAppBin(CHNCPU_RuntimeEnvironment *env)
+{
+    int i;
+    
+    for(i = 0; i < env->appbinsize; i++){
+        printf("%02X ", env->appbin0[i]);
+        if((i & 0xf) == 0xf){
+            putchar('\n');
+        }
+    }
+    if(((i - 1) & 0xf) != 0xf){
+        putchar('\n');
+    }
+}
+
+void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env)
+{
+    int i, regs = 0;
+    
+    puts(">>> Integer registers");
+    
+    for(i = 0; i < CHNCPU_NUMBER_OF_IREG; i++){
+        if(env->iRegBits[i]){
+            printf("R%02X = %10d = 0x%08X(%2d) ", i, env->iReg[i], env->iReg[i], env->iRegBits[i]);
+			putchar('\n');
+            regs++;
+        }
+    }
+    if(((regs - 1) & 0xF) != 0xF){
+        putchar('\n');
+    }
+}
+
+void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env)
+{
+    int i, regs = 0;
+    
+    puts(">>> Pointer registers");
+    
+    for(i = 0; i < CHNCPU_NUMBER_OF_PREG; i++){
+        if(env->pReg[i].type != CHNCPU_PType_Undefined){
+			if(env->pReg[i].mindex != CHNCPU_MemoryIndex_INVALID){
+				printf("P%02X: Type:%2X  mem[%d][%d]", i, env->pReg[i].type, env->pReg[i].mindex, env->pReg[i].pindex);
+			} else{
+				printf("P%02X: Type:%2X  %s[%d]", i, env->pReg[i].type, CHNCPU_Op_DATA_GetFilePath(env->pReg[i].opTag), env->pReg[i].pindex);
+			}
+			putchar('\n');
+            regs++;
+        }
+    }
+    if(((regs - 1) & 0xF) != 0xF){
+        putchar('\n');
+    }
+}