* src/vm/vm.c, src/vm/vm.h: Moved to .cpp.

[cacao.git] / src / vmcore / primitivecore.c

diff --git a/src/vmcore/primitivecore.c b/src/vmcore/primitivecore.c
index a1bb2a76aa08ff0ba2060b45715a89213e1c35d1..5f4cac830832c9759e76da40c42bca35e9884639 100644 (file)
--- a/src/vmcore/primitivecore.c
+++ b/src/vmcore/primitivecore.c
@@ -1,9 +1,7 @@
 /* src/vmcore/primitivecore.c - core functions for primitive types
 
-   Copyright (C) 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -31,10 +29,11 @@
 #include <stdint.h>
 
 #include "vm/global.h"
-#include "vm/primitive.h"
-#include "vm/vm.h"
+#include "vm/primitive.hpp"
+#include "vm/vm.hpp"
 
 #include "vmcore/class.h"
+#include "vmcore/options.h"
 #include "vmcore/utf8.h"
 
 
@@ -69,7 +68,7 @@ primitivetypeinfo primitivetype_table[PRIMITIVETYPE_COUNT] = {
 };
 
 
-/* primitive_preinit ***********************************************************
+/* primitive_init **************************************************************
 
    Fill the primitive type table with the primitive-type classes,
    array-classes and wrapper classes.  This is important in the VM
@@ -96,6 +95,8 @@ void primitive_init(void)
        classinfo *ac;
        int        i;
 
+       TRACESUBSYSTEMINITIALIZATION("primitive_init");
+
        /* Load and link primitive-type classes and array-classes. */
 
        for (i = 0; i < PRIMITIVETYPE_COUNT; i++) {
@@ -114,9 +115,9 @@ void primitive_init(void)
 
                c = class_create_classinfo(name);
 
-               /* primitive classes don't have a super class */
+               /* Primitive type classes don't have a super class. */
 
-               c->super.any = NULL;
+               c->super = NULL;
 
                /* set flags and mark it as primitive class */
 
@@ -210,6 +211,8 @@ void primitive_postinit(void)
        classinfo *c;
        int        i;
 
+       TRACESUBSYSTEMINITIALIZATION("primitive_postinit");
+
        assert(class_java_lang_Class);
        assert(class_java_lang_Class->vftbl);