Commit: 1843ee32105cd8d4243f5b5d0e1096d8a35a1a02 - chncpu (git)

Commit MetaInfo

• Revisión: 1843ee32105cd8d4243f5b5d0e1096d8a35a1a02 (tree)
• Tiempo: 2014-07-20 01:23:03
• Autor: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

ビットカウント系アルゴリズムの追加。（ch4内部実装用）

Cambiar Resumen

• modified: chncpu.xcodeproj/project.pbxproj
• modified: chncpu/chncpu.c
• modified: chncpu/chncpu.h
• add: chncpu/subfunc.c
• delete: debug.c => chncpu/debug.c

Diferencia incremental

--- a/chncpu.xcodeproj/project.pbxproj
+++ b/chncpu.xcodeproj/project.pbxproj
@@ -13,9 +13,10 @@
 		17478D041940B66700293791 /* opcode.c in Sources */ = {isa = PBXBuildFile; fileRef = 17478D031940B66700293791 /* opcode.c */; };
 		1786B0941956C18800FD4F7B /* label.c in Sources */ = {isa = PBXBuildFile; fileRef = 1786B0931956C18800FD4F7B /* label.c */; };
 		17958C6F196C0E8000D7DBB4 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = 17958C6E196C0E8000D7DBB4 /* data.c */; };
+		17AE6FD2197AAA32006A5C2D /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 17AE6FD1197AAA32006A5C2D /* debug.c */; };
+		17AE6FD5197AB834006A5C2D /* subfunc.c in Sources */ = {isa = PBXBuildFile; fileRef = 17AE6FD4197AB834006A5C2D /* subfunc.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 */
 
@@ -43,10 +44,11 @@
 		17478D031940B66700293791 /* opcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opcode.c; sourceTree = "<group>"; usesTabs = 1; };
 		1786B0931956C18800FD4F7B /* label.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = label.c; sourceTree = "<group>"; };
 		17958C6E196C0E8000D7DBB4 /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data.c; sourceTree = "<group>"; };
+		17AE6FD1197AAA32006A5C2D /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
+		17AE6FD4197AB834006A5C2D /* subfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = subfunc.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 */
 
@@ -83,8 +85,8 @@
 			children = (
 				17478CFC193E2A7800293791 /* chncpu.h */,
 				17478CF3193E2A4900293791 /* chncpu.c */,
-				17E50931196AD91D0091A22A /* debug.c */,
 				17DD55BA1967992200DA7D82 /* args.c */,
+				17AE6FD1197AAA32006A5C2D /* debug.c */,
 				17478D00193F3D0000293791 /* ch4.c */,
 				17478D02193F586100293791 /* ch4.h */,
 				17E50930196AD6BF0091A22A /* opcache.h */,
@@ -94,6 +96,7 @@
 				1786B0931956C18800FD4F7B /* label.c */,
 				17478CFD193E2ADA00293791 /* test.hex */,
 				17E509291967F7770091A22A /* src.txt */,
+				17AE6FD4197AB834006A5C2D /* subfunc.c */,
 			);
 			path = chncpu;
 			sourceTree = "<group>";
@@ -150,13 +153,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				1786B0941956C18800FD4F7B /* label.c in Sources */,
+				17AE6FD5197AB834006A5C2D /* subfunc.c in Sources */,
 				17958C6F196C0E8000D7DBB4 /* data.c in Sources */,
-				17E50932196AD91D0091A22A /* debug.c in Sources */,
 				17F95C01194C8DA70064E1B6 /* bios.c in Sources */,
 				17DD55BB1967992200DA7D82 /* args.c in Sources */,
 				17478D041940B66700293791 /* opcode.c in Sources */,
 				17478CF4193E2A4900293791 /* chncpu.c in Sources */,
 				17478D01193F3D0000293791 /* ch4.c in Sources */,
+				17AE6FD2197AAA32006A5C2D /* debug.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/chncpu/chncpu.c
+++ b/chncpu/chncpu.c
@@ -13,6 +13,12 @@ int main(int argc, const char *argv[])
     CHNCPU_RuntimeEnvironment *env;
 	CHNCPU_VMArgs *vmArgs;
 	
+	
+	unsigned int i;
+	i = 0x0010f0ff;
+	printf("0x%08X : %d, %d\n", i, GetBitCount32(i), GetNumberOfLeadingZero(i));
+	
+	
 	vmArgs = bindVMArgs(argc, argv);
 	env = CHNCPU_CreateRuntimeEnvironment(CHNCPU_CreateOpTableSet(), CHNCPU_CreateBIOS());
 	
@@ -46,6 +52,8 @@ int decodeHexString(char *src0, char *src1, unsigned char *dst0, unsigned char *
     // 1: second 4-bit
     // 2: in string literal (byte aligned)
 	// 3: in string literal (not aligned)
+	// []: unsigned raw value
+	// (): signed raw value
     unsigned char d = 0;
     char c;
     

--- a/chncpu/chncpu.h
+++ b/chncpu/chncpu.h
@@ -16,9 +16,9 @@
 
 // DEBUG Flag
 #define DEBUG_PRINT_APPBIN_BEFORE_EXECUTION	0
-#define DEBUG_PRINT_IREG_AFTER_EXECUTION		1
-#define DEBUG_PRINT_PREG_AFTER_EXECUTION    1
-#define DEBUG_PRINT_OP_BINDING				1
+#define DEBUG_PRINT_IREG_AFTER_EXECUTION		0
+#define DEBUG_PRINT_PREG_AFTER_EXECUTION    0
+#define DEBUG_PRINT_OP_BINDING				0
 #define DEBUG_PRINT_OP_EXECUTING			0
 
 // VM flags
@@ -270,4 +270,9 @@ void CHNCPU_DumpIReg(CHNCPU_RuntimeEnvironment *env);
 void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env);
 void CHNCPU_PrintErrorMessage(CHNCPU_RuntimeEnvironment *env);
 
+// @subfunc.c
+int GetBitCount32(unsigned int val);
+int GetNumberOfLeadingZero(unsigned int val);
+
+
 #endif

--- a/debug.c
+++ b/chncpu/debug.c
@@ -49,10 +49,16 @@ void CHNCPU_DumpPReg(CHNCPU_RuntimeEnvironment *env)
     
     for(i = 0; i < CHNCPU_NUMBER_OF_PREG; i++){
         if(env->pReg[i].type != CHNCPU_PType_Undefined){
+			printf("P%02X: ", i);
+			if(env->pReg[i].type == CHNCPU_PType_Label){
+				printf("Type:Label ");
+			} else{
+				printf("Type:%2X ", env->pReg[i].type);
+			}
 			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);
+				printf("mem[%d][%d]", env->pReg[i].mindex, env->pReg[i].pindex);
 			} else{
-				printf("P%02X: Type:%2X  %s[%d]\t(Len:%d)", i, env->pReg[i].type, env->pReg[i].data->filePath, env->pReg[i].pindex, env->pReg[i].data->count);
+				printf("%s[%d]\t(Len:%d)", env->pReg[i].data->filePath, env->pReg[i].pindex, env->pReg[i].data->count);
 			}
 			putchar('\n');
             regs++;

--- /dev/null
+++ b/chncpu/subfunc.c
@@ -0,0 +1,34 @@
+//
+//  subfunc.c
+//  chncpu
+//
+//  Created by 西田　耀 on 2014/07/19.
+//  Copyright (c) 2014年 CHNOSProject. All rights reserved.
+//
+
+#include "chncpu.h"
+
+int GetBitCount32(unsigned int val)
+{
+	// http://www.nminoru.jp/~nminoru/programming/bitcount.html
+    val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
+    val = (val & 0x33333333) + ((val >> 2) & 0x33333333);
+    val = (val & 0x0f0f0f0f) + ((val >> 4) & 0x0f0f0f0f);
+    val = (val & 0x00ff00ff) + ((val >> 8) & 0x00ff00ff);
+    val = (val & 0x0000ffff) + ((val >>16) & 0x0000ffff);
+    return (int)val;
+}
+
+
+int GetNumberOfLeadingZero(unsigned int val)
+{
+	// 左側にあるゼロの個数を求める
+	// http://www.nminoru.jp/~nminoru/programming/bitcount.html
+	int c = 0;
+	c |= ((val << c) & 0xFFFF0000) ? 0 : 16;
+	c |= ((val << c) & 0xFF000000) ? 0 : 8;
+	c |= ((val << c) & 0xF0000000) ? 0 : 4;
+	c |= ((val << c) & 0xC0000000) ? 0 : 2;
+	c |= ((val << c) & 0x80000000) ? 0 : 1;
+	return c;
+}
\ No newline at end of file