Add jvmd & Fixed compile warning

Author: zhangkari

debug/CMakeLists.txt

@@ -39,3 +39,8 @@ TARGET_LINK_LIBRARIES(jvmp libvmbase)
 ADD_EXECUTABLE(jar ${src_dir}/jar.c)
 TARGET_LINK_LIBRARIES(jar libminiz)
 TARGET_LINK_LIBRARIES(jar libvmbase)
+
+# jvmd
+ADD_EXECUTABLE(jvmd ${src_dir}/jvmd.c)
+TARGET_LINK_LIBRARIES(jvmd libminiz)
+TARGET_LINK_LIBRARIES(jvmd libvmbase)

release/CMakeLists.txt

@@ -36,3 +36,8 @@ TARGET_LINK_LIBRARIES(jvmp libvmbase)
 ADD_EXECUTABLE(jar ${src_dir}/jar.c)
 #TARGET_LINK_LIBRARIES(jar libminiz)
 TARGET_LINK_LIBRARIES(jar libvmbase)
+
+# jvmd
+ADD_EXECUTABLE(jvmd ${src_dir}/jvmd.c)
+TARGET_LINK_LIBRARIES(jvmd libminiz)
+TARGET_LINK_LIBRARIES(jvmd libvmbase)

src/jar.c

@@ -13,6 +13,8 @@
 #include <string.h>
 #include "libjar.h"
 
+#define JAR_VER "0.0.1"
+
 static void usage() {
 	printf("Usage\n");
 	printf("  %s [-c f1 f2 ...] [-d] path \n", "jar");
@@ -63,29 +65,47 @@ static void on_finish(void *param) {
 }
 
 int main(int argc, char *argv[]) {
-	if (argc <= 2) {
+	if (argc < 2) {
 		usage();	
 		return -1;
 	}
 
+	if (2 == argc) {
+		if (0 == strncmp("-v", argv[1], 2)) {
+			printf("jar %s compiled on %s [email protected].\n", JAR_VER, __DATE__);
+			return 0;
+		} else {
+			usage();
+			return -1;
+		}
+	}
+
 	if (strcmp(argv[1], "-d") == 0) {
 		if (argc != 3) {
 			usage();
 			return -1;
 		}
 
-		executeUnpackJar (argv[2], on_start, on_progress, NULL, on_finish, NULL);
-	}
-	else if (strcmp(argv[1], "-c") == 0) {
+		executeUnpackJar (argv[2], 
+				on_start,
+				on_progress,
+				NULL, 
+				on_finish,
+				NULL);
+
+		return 0;
+
+	} else if (strcmp(argv[1], "-c") == 0) {
 		if (argc <= 3) {
 			usage();
 			return -1;
 		}
-		else {
-			executePackJar ((const char**)&argv[2], argc-3, argv[argc-1]);	
-		}
-	}
-	else {
+
+		executePackJar ((const char**)&argv[2], argc-3, argv[argc-1]);	
+
+		return 0;
+
+	} else {
 		usage();
 		return -1;
 	}

src/jvm.c

@@ -281,7 +281,7 @@ int parseCmdLine(int argc, char **argv, Property **props) {
 	} 
 	else if (argc == 2) {
 		if (strcmp(argv[1], "-v") == 0) {
-			printf("jvm %s [email protected]\n", JAVA_VERSION);
+			printf("jvm %s compiled on %s [email protected]\n", JAVA_VERSION, __DATE__);
 			exit(0);
 		}
 		else if (strcmp(argv[1], "-h") == 0) {
@@ -322,4 +322,6 @@ int main(int argc, char *argv[]) {
 	initVM(&initArgs, &vm);
 	startVM(&vm);
 	destroyVM(&vm);
+
+	return 0;
 }

src/jvmd.c

@@ -0,0 +1,45 @@
+/********************************************
+ * file name:   jvmd.c
+ * description: java virtual machine debugger
+ * author:      kari.zhang
+ *
+ * modifications:
+ *
+ * 1. Created by Kari.Zhang @ 2016-01-11
+ * *****************************************/
+
+#include <stdio.h>
+#include <string.h>
+
+#define JVMD_VER "0.0.1"
+
+static void logDebugger();
+static void usage();
+
+int main(int argc, char *argv[]) {
+
+	if (2 != argc) {
+		usage();
+		return -1;
+	}
+
+	if (0 == strncmp(argv[1], "-v", 2)) {
+		logDebugger();
+		return 0;
+	} else if (*argv[1] == '-') {
+		usage();
+		return -1;
+	} else {
+		printf("Not implemented yet!\n");
+		return 0;
+	}
+}
+
+static void logDebugger() {
+	printf("jvmd %s compiled on %s [email protected]\n", JVMD_VER, __DATE__);
+}
+
+static void usage() {
+	printf("Usage:\n");
+	printf("    jvmd CLASS_NAME\n");
+}

src/jvmp.c

@@ -15,26 +15,41 @@
 #include <string.h>
 #include "class.h"
 
+#define JVMP_VER "0.0.1"
+
 static void usage();
 
 int main(int argc, char *argv[]) {
 	if (2 != argc) {
 		usage();
 		return -1;
 	}
-    char path[256];
-    memset(path, 0, 256);
-    strcpy(path, argv[1]);
-    Class *mainClass = loadClassFromFile(path, argv[1]);
-    if (NULL == mainClass) {
-        fprintf(stderr, "Failed loadClass from file\n");
-        return -1;
-    }
-    ClassEntry *clsEntry = CLASS_CE(mainClass);
-    logClassEntry(clsEntry);
-
-    //TOD
-    // freeClass();
+
+	if (0 == strncmp(argv[1], "-v", 2)) {
+		printf("jvmp %s compiled on %s [email protected]\n", JVMP_VER, __DATE__);
+		return 0;
+
+	} else if (*argv[1] == '-') {
+		usage();
+		return -1;
+
+	} else {
+		char path[256];
+		memset(path, 0, 256);
+		strcpy(path, argv[1]);
+		Class *mainClass = loadClassFromFile(path, argv[1]);
+		if (NULL == mainClass) {
+			fprintf(stderr, "Failed loadClass from file\n");
+			return -1;
+		}
+		ClassEntry *clsEntry = CLASS_CE(mainClass);
+		logClassEntry(clsEntry);
+
+		//TOD
+		// freeClass();
+
+		return 0;
+	}
 }
 
 static void usage() {

src/vm/class.c

@@ -62,7 +62,6 @@ static void readConstPool(ClassEntry* class, U2 cp_count, U1** base) {
 	ConstPool *constPool = newConstPool(cp_count);
 	assert(NULL != constPool);
 	int i;
-	int j;
 	for (i = 1; i < cp_count; ++i) {
 		READ_U1(tag, *base);
 		constPool->entries[i].tag = tag;
@@ -170,7 +169,6 @@ static void readClassField(Class *cls, U2 field_count, U1** base) {
 	char *name = NULL;
 	U2 acc_flags;
 	U2 attr_count;
-	U2 clsidx;
 	U2 nameidx;
 	U2 typeidx;
 
@@ -576,7 +574,6 @@ static void readAnnotationElementValue(ClassEntry* class, U1** base) {
     U2 type_idx;
     U2 num_pairs;
     U2 elem_name_idx;
-    U1 tag;
     int i, j;
     for (i = 0; i < anno_count; ++i) {
         READ_U2(type_idx, *base);
@@ -831,7 +828,7 @@ Class* loadClassFromFile(char *path, char *classname) {
 		fclose(fp);
 		return NULL;
 	}
-	Class *class = defineClass(classname, buff, size);
+	Class *class = defineClass(classname, (const char *)buff, size);
 	free(buff);
 	fclose(fp);
 	return class;
@@ -1052,7 +1049,9 @@ void logConstPoolEntry(const ConstPool* pool, const ConstPoolEntry* entry)
 		case CONST_Double:
 			u4high = entry->info.double_info.high_bytes;
 			u4low = entry->info.double_info.low_bytes;
-			u8 = u4high<<32 + u4low;
+			u8 = u4high;
+			u8 <<= 32;
+			u8 += u4low;
 			printf("double\t%" PRIu64 "\n", u8);
 			break;
 
@@ -1196,16 +1195,6 @@ void logClassEntry(ClassEntry *clsEntry)
     printf("  major version: %d\n", (int)clsEntry->reserve[1]);
     printf("  Constant pool count:%d\n", clsEntry->constPool->length);
 
-    int cls_idx;
-    int nametype_idx;
-    int name_idx;
-    int type_idx;
-    int index;
-
-	U4 u4high;
-	U4 u4low;
-	U8 u8;
-
 	for (i = 1; i < clsEntry->constPool->length; ++i) {
 		printf("  #%d = ", i);
 		logConstPoolEntry(clsEntry->constPool, 

src/vm/instruction.c

@@ -459,7 +459,7 @@ bool needAddOffset (U1 opcode)
  */
 #define INST_FUNC(X) func_inst_##X
 #define _T(X) #X
-#define INIT_INST(X, Y) X, _T(X), 0, Y, (Y + 1), INST_FUNC(X), 0
+#define INIT_INST(X, Y) {X, _T(X), {0}, Y, (Y + 1), INST_FUNC(X), 0}
 static Instruction sInstructionTable[] = {
 	INIT_INST(nop, 0),          // 0x00
 	INIT_INST(aconst_null, 0),  // 0x01