Refactoring/renaming

Author: noahhaasis

.vscode/launch.json

@@ -8,8 +8,8 @@
             "name": "gcc - Aktive Datei erstellen und debuggen",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/main",
-            "args": ["Main.class"],
+            "program": "${workspaceFolder}/bin/main",
+            "args": ["test/Main.class"],
             "stopAtEntry": false,
             "cwd": "${fileDirname}",
             "environment": [],
@@ -26,4 +26,4 @@
             "miDebuggerPath": "/usr/bin/gdb"
         }
     ]
-}
+}

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "build",
             "type": "shell",
-            "command": "${workspaceFolder}/build.sh"
+            "command": "${workspaceFolder}/build/build.sh"
         }
     ]
-}
+}

bin/main

@@ -21,14 +21,14 @@ typedef struct {
     if (!buffer) { \
       void *base = malloc(sizeof(sb_header) + INITIAL_CAPACITY * sizeof(elem)); \
       *((sb_header *)base) = (sb_header) {.length = 1, .capacity = INITIAL_CAPACITY}; \
-      buffer = (((char *) base) + sizeof(sb_header)); \
+      buffer = (void *)(((char *) base) + sizeof(sb_header)); \
       buffer[0] = elem; \
     } else { \
       sb_header *base = __buf_header(buffer); \
       if (base->length == base->capacity) { \
         base = realloc(base, sizeof(sb_header) + base->capacity * 2 * sizeof(elem)); \
         base->capacity *= 2; \
-        buffer = (((char *) base) + sizeof(sb_header)); \
+        buffer = (void  *)(((char *) base) + sizeof(sb_header)); \
       }\
       buffer[base->length] = elem; \
       base->length += 1; \

buffer.h

@@ -13,18 +13,16 @@
 #include <unistd.h>
 #include <stdbool.h>
 
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef int8_t  i8;
+typedef int16_t i16;
+typedef int32_t i32;
 typedef int64_t i64;
 
-
-typedef uint8_t u1;
-typedef uint16_t u2;
-typedef uint32_t u4;
-typedef uint64_t u8;
-
-typedef int8_t  i1;
-typedef int16_t i2;
-typedef int32_t i4;
-
 #define MIN(a, b) (a < b ? a : b)
 
 /* NOTE(Noah):
@@ -49,75 +47,75 @@ typedef int32_t i4;
 #define CONSTANT_MethodType           16u
 #define CONSTANT_InvokeDynamic        18u
 
-void pretty_print_constant_tag(u1 tag);
+void pretty_print_constant_tag(u8 tag);
 
 typedef struct {
-    u1 tag;
+    u8 tag;
     union {
       struct {
-        u2 name_index;
+        u16 name_index;
       } class_info;
 
       struct {
-        u2 class_index;
-        u2 name_and_type_index;
+        u16 class_index;
+        u16 name_and_type_index;
       } field_ref_info;
 
       struct {
-        u2 class_index;
-        u2 name_and_type_index;
+        u16 class_index;
+        u16 name_and_type_index;
       } methodref_info;
 
       struct {
-        u2 class_index;
-        u2 name_and_type_index;
+        u16 class_index;
+        u16 name_and_type_index;
       } interface_methodref_info;
 
       struct {
-        u2 string_index;
+        u16 string_index;
       } string_info;
 
       struct {
-        u4 bytes;
+        u32 bytes;
       } integer_info;
 
       float  float_value;
       i64    long_value;
       double double_value;
 
       struct {
-        u2 name_index;
-        u2 descriptor_index;
+        u16 name_index;
+        u16 descriptor_index;
       } name_and_type_info;
 
       struct {
-        u2 length;
-        u1* bytes;
+        u16 length;
+        u8* bytes;
       } utf8_info;
 
       struct {
-        u1 reference_kind;
-        u2 reference_index;
+        u8 reference_kind;
+        u16 reference_index;
       } method_handle_info;
 
       struct {
-        u2 descriptor_index;
+        u16 descriptor_index;
       } method_type_info;
 
       struct {
-        u2 bootstrap_method_attr_index;
-        u2 name_and_type_index;
+        u16 bootstrap_method_attr_index;
+        u16 name_and_type_index;
       } invoke_dynamic_info;
-    } info;
+    } as;
     // TODO(noah): rename "info" to "as"
-    /*u1 info[]*/;
+    /*u8 info[]*/;
 } cp_info;
 
 typedef struct {
-  u2 start_pc;
-  u2 end_pc;
-  u2 handler_pc;
-  u2 catch_type;
+  u16 start_pc;
+  u16 end_pc;
+  u16 handler_pc;
+  u16 catch_type;
 } exception_table_entry;
 
 typedef enum {
@@ -151,15 +149,15 @@ typedef enum {
 typedef struct attribute_info attribute_info;
 
 typedef struct {
-  u2 max_stack;
-  u2 max_locals;
-  u4 code_length;
-  u1 *code;
-  /* u1 code[code_length]; */
-  u2 exception_table_length;
+  u16 max_stack;
+  u16 max_locals;
+  u32 code_length;
+  u8 *code;
+  /* u8 code[code_length]; */
+  u16 exception_table_length;
   exception_table_entry *exception_table;
   /* exception_table[exception_table_length]; */
-  u2 attributes_count;
+  u16 attributes_count;
   attribute_info *attributes;
   /* attribute_info attributes[attributes_count]; */
 } code_attribute;
@@ -174,41 +172,40 @@ typedef enum {
 } attribute_type;
 
 struct attribute_info {
-    u2 attribute_name_index;
-    u4 attribute_length;
+    u16 attribute_name_index;
+    u32 attribute_length;
     attribute_type type;
-    // TODO: Include the attribute kind as an enum?
     union {
       /* SourceFile_attribute */
-      u2 sourcefile_index;
+      u16 sourcefile_index;
 
       /* ConstantValue_attribute */
-      u2 constantvalue_index;
+      u16 constantvalue_index;
 
       /* Code_attribute */
       code_attribute *code_attribute;
 
       /* other */
-      u1* bytes;
-    } info;
-    // u1 *info;
-    /* u1 info[attribute_length]; */
+      u8* bytes;
+    } as;
+    // u8 *info;
+    /* u8 info[attribute_length]; */
 };
 
 typedef struct {
-    u2             access_flags;
-    u2             name_index;
-    u2             descriptor_index;
-    u2             attributes_count;
+    u16             access_flags;
+    u16             name_index;
+    u16             descriptor_index;
+    u16             attributes_count;
     attribute_info *attributes;
     /* attribute_info attributes[attributes_count]; */
 } method_info;
 
 typedef struct {
-    u2             access_flags;
-    u2             name_index;
-    u2             descriptor_index;
-    u2             attributes_count;
+    u16             access_flags;
+    u16             name_index;
+    u16             descriptor_index;
+    u16             attributes_count;
     attribute_info *attributes;
     /* attribute_info attributes[attributes_count]; */
 } field_info;
@@ -224,46 +221,46 @@ typedef struct {
 #define ACC_ENUM        0x4000u
 
 typedef struct {
-  u4             magic;
-  u2             minor_version;
-  u2             major_version;
-  u2             constant_pool_count;
+  u32             magic;
+  u16             minor_version;
+  u16             major_version;
+  u16             constant_pool_count;
   cp_info        *constant_pool;
   /* cp_info        constant_pool[constant_pool_count-1]; */
-  u2             access_flags;
-  u2             this_class;
-  u2             super_class;
-  u2             interfaces_count;
-  u2             *interfaces;
-  /* u2             interfaces[interfaces_count]; */
-  u2             fields_count;
+  u16             access_flags;
+  u16             this_class;
+  u16             super_class;
+  u16             interfaces_count;
+  u16             *interfaces;
+  /* u16             interfaces[interfaces_count]; */
+  u16             fields_count;
   field_info     *fields;
   /* field_info     fields[fields_count]; */
-  u2             methods_count;
+  u16             methods_count;
   method_info    *methods;
   /* method_info    methods[methods_count]; */
-  u2             attributes_count;
+  u16             attributes_count;
   attribute_info *attributes;
   /* attribute_info attributes[attributes_count]; */
 } ClassFile;
 
 attribute_type parse_attribute_type(char *unicode_name, int length);
 
-attribute_info parse_attribute_info(ClassFile *class_file, u1 *data, int *out_byte_size /* How many bytes were parsed */);
+attribute_info parse_attribute_info(ClassFile *class_file, u8 *data, int *out_byte_size /* How many bytes were parsed */);
 
-method_info parse_method_info(ClassFile *class_file, u1 *data, int *out_byte_size /* How many bytes were parsed */);
+method_info parse_method_info(ClassFile *class_file, u8 *data, int *out_byte_size /* How many bytes were parsed */);
 
-field_info parse_field_info(ClassFile *class_file, u1 *data, int *out_byte_size /* How many bytes were parsed */);
+field_info parse_field_info(ClassFile *class_file, u8 *data, int *out_byte_size /* How many bytes were parsed */);
 
-cp_info parse_cp_info(u1 *data, int *out_byte_size /* How many bytes were parsed */);
+cp_info parse_cp_info(u8 *data, int *out_byte_size /* How many bytes were parsed */);
 
 ClassFile *parse_class_file(char *filename);
 
 void free_class_file(ClassFile *class_file);
 
 code_attribute *find_code(ClassFile *class_file, method_info method_info);
 
-method_info find_method(ClassFile *class_file, char *name, u4 name_length);
+method_info find_method(ClassFile *class_file, char *name, u32 name_length);
 
 void execute(ClassFile *class_file, code_attribute method_code);
 

jvm.h

@@ -17,12 +17,17 @@ int main(int argc, char **argv) {
   }
 
   ClassFile *class_file = parse_class_file(argv[1]);
+  if (!class_file) {
+    printf("Failed to parse class file \"%s\"\n", argv[1]);
+    return -1;
+  }
+
   printf("magic: %u %x\n", class_file->magic, class_file->magic);
   printf("minor version %u\n", class_file->minor_version);
   printf("major version %u\n", class_file->major_version);
   printf("constant pool count %u\n", class_file->constant_pool_count);
-  printf("methodref %u %u %u\n", class_file->constant_pool[0].tag, class_file->constant_pool[0].info.methodref_info.class_index, class_file->constant_pool[0].info.methodref_info.name_and_type_index);
-  printf("class %u %u\n", class_file->constant_pool[1].tag, class_file->constant_pool[1].info.class_info.name_index);
+  printf("methodref %u %u %u\n", class_file->constant_pool[0].tag, class_file->constant_pool[0].as.methodref_info.class_index, class_file->constant_pool[0].as.methodref_info.name_and_type_index);
+  printf("class %u %u\n", class_file->constant_pool[1].tag, class_file->constant_pool[1].as.class_info.name_index);
   printf("...\n");
   printf("access_flags 0x%x\n", class_file->access_flags);
   printf("this_class %d\n", class_file->this_class);
@@ -35,9 +40,9 @@ int main(int argc, char **argv) {
   // Print the source file name
   for (int i = 0; i < class_file->attributes_count; i++) {
     if (class_file->attributes[i].type == SourceFile_attribute) {
-      int sourcefile_index = class_file->attributes[i].info.sourcefile_index - 1;
+      int sourcefile_index = class_file->attributes[i].as.sourcefile_index - 1;
       cp_info constant = class_file->constant_pool[sourcefile_index];
-      printf("source file name: \"%.*s\"\n", constant.info.utf8_info.length, constant.info.utf8_info.bytes);
+      printf("source file name: \"%.*s\"\n", constant.as.utf8_info.length, constant.as.utf8_info.bytes);
     }
   }