creating super classes

Author: zapster

src/jvm/class.fs

@@ -341,29 +341,56 @@ defer jvm_stack.invokeStaticInitializer()
 \ NOTE loader is a value to identify loaders
 
   \ get this class
-  addr_cf jvm_cf_constpool_addr dup ( addr_cp addr_cp )
-  addr_cf jvm_cf_this_class ( addr_cp addr_cp idx1 )
-  jvm_constpool.getClassname_idx() ( scl_addr )
-  jvm_cp_utf8_c-ref ( scl_str n )
-  s" java/lang/Object" str= invert IF
+  \ addr_cf jvm_cf_constpool_addr dup ( addr_cp addr_cp )
+  \ addr_cf jvm_cf_this_class ( addr_cp addr_cp idx1 )
+  \ jvm_constpool.getClassname_idx() ( scl_addr )
+  \ jvm_cp_utf8_c-ref ( scl_str n )
+  \ FIXME cleanup
+  \ 2drop
+\  s" java/lang/Object" str= invert IF
     \ get ref to superclass
-    addr_cf jvm_cf_constpool_addr dup ( addr_cp addr_cp )
-    addr_cf jvm_cf_super_class ( addr_cp idx1 )
-    jvm_constpool.getClassname_idx() ( scl_addr )
-    jvm_cp_utf8_c-ref ( scl_str n )
-    2dup ( scl_str n scl_str n )
-    jvm_stack.newClass() ( scl_str n )
-    jvm_stack.findAndInitClass() throw ( addr_super_class )
-    dup ( addr_super_class addr_super_class )
-    addr_cl jvm_class.super + ! ( addr_super_class )
+
+  addr_cf jvm_cf_constpool_addr
+  ( addr_cp )
+  \ ." STACK PREPREIF: " .s CR
+  addr_cf jvm_cf_super_class
+  ( addr_cp idx1 )
+  \ ." STACK PREIF: " .s CR
+  dup 0<> IF
+    \ ." STACK IF: " .s CR
+    jvm_constpool.getClassname_idx()
+    ( scl_addr )
+    jvm_cp_utf8_c-ref
+    ( scl_str n )
+    \ debug
+    \ 2dup ." Superclass: " type CR
+    \ end debug
+    2dup
+    ( scl_str n scl_str n )
+    jvm_stack.newClass()
+    ( scl_str n )
+    jvm_stack.findAndInitClass() throw
+    ( addr_super_class )
+    dup
+    ( addr_super_class addr_super_class )
+    addr_cl jvm_class.super + !
+    ( addr_super_class )
 
     \ set field length from superclass
     jvm_class.getField_length() ( length )
     addr_cl jvm_class.incField_length()
+  ELSE
+    \ ." STACK ELSE: " .s CR
+    2drop
   ENDIF
-  
+  \ ." STACK POSTIF: " .s CR
+
   \ create runtime constant pool
-  addr_cf jvm_rtcp.new() addr_cl jvm_class.rtcp + !
+  addr_cf jvm_rtcp.new()
+  \ debug
+  \ ." RTCP: " .s CR
+  \ end debug
+  addr_cl jvm_class.rtcp + !
   \ TODO add super class
 
   \ create static fields
@@ -383,12 +410,12 @@ defer jvm_stack.invokeStaticInitializer()
     ( addr_md addr_md name_idx desc_idx )
     addr_cf -rot jvm_cp_nametype_identifier
     \ 2dup ." Method: " type CR
-    addr_cl jvm_class.getMethodList() 
+    addr_cl jvm_class.getMethodList()
     \ ." pre add word " .s CR
     jvm_add_word
     dup jvm_md_size +
   LOOP
-  drop 
+  drop
 
   jvm_class.STATUS:PREPARED addr_cl jvm_class.status + ! \ store status
   loader addr_cl jvm_class.init_loader + !               \ store loader
@@ -397,8 +424,29 @@ defer jvm_stack.invokeStaticInitializer()
 
 : jvm_class.init() { addr_cl -- wior }
 \ *G initialaze class
+
   \ TODO init superclass
-  \ TODO call static initialazer
+  addr_cl jvm_class.getRTCP()
+  dup jvm_rtcp.getSuperClassIdx()
+  dup 0<> IF
+    ( rtcp idx )
+    jvm_rtcp.getClassName()
+    ( c-addr n )
+    jvm_stack.findAndInitClass()
+    drop
+  ELSE
+    2drop
+  ENDIF
+
+  \ TODO init interfaces
+
+  \ debug
+  addr_cl jvm_class.getRTCP()
+  jvm_rtcp.getThisClass()
+  ." initializing: " type CR
+  \ end debug
+
+  \ call static initializer
   dup jvm_class.STATUS:INIT addr_cl jvm_class.status + ! \ store status
   jvm_stack.invokeStaticInitializer() throw
   0

src/jvm/classfile.fs

@@ -1031,7 +1031,12 @@ variable jvm_p_attributes_addr \ stores the pointer to the first field
   ." Super Class: "
   addr jvm_cf_constpool_addr \ get start of the constpool
   addr jvm_cf_super_class
-  jvm_constpool_print_classname_idx CR
+  dup 0<> IF
+    jvm_constpool_print_classname_idx CR
+  ELSE
+    2 drop
+    ." <no superclass>" CR
+  ENDIF
 ;
 
 : jvm_cf_interfaces_count_print ( addr -- )

src/jvm/classloader.fs

@@ -18,7 +18,7 @@
 \ You should have received a copy of the GNU General Public License
 \ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \ this file implements functionality that is needed to read class files
-\ this file contains the implementaion of the class loader 
+\ this file contains the implementaion of the class loader
 
 require exception.fs
 require util.fs
@@ -91,6 +91,12 @@ variable jvm_classpath_list
       s" .class" 
       strcat
       ( c-addr n -- )
+
+      \ debug
+      \ ." trying: "
+      \ 2dup type CR
+      \ end debug
+
       try
         jvm_read_classfile
       iferror
@@ -113,6 +119,9 @@ variable jvm_classpath_list
     0= IF
       JVM_CLASSNOTFOUND_EXCEPTION throw
     ELSE
+      \ debug
+      \ ." class found " CR
+      \ end debug
       0
     ENDIF
   ENDIF

src/jvm/rtconstpool.fs

@@ -22,8 +22,8 @@
 \ ========
 \ *! rtconstpool
 \ *T Runtime Constant Pool
-\ 
-\ *P This file contains the implentation of the Runtime Constant Pool 
+
+\ *P This file contains the implentation of the Runtime Constant Pool
 \ ** as specified in the JVM specification §5.1 and §5.3.
 \ ========
 
@@ -33,7 +33,7 @@ require classfile.fs
 \ ========
 \ *S Runtime Constant Pool Struct
 \ ========
-\ 
+
 \ *E runtime_constant_ool {
 \ **    ClassFile classfile;
 \ **    addr constpool_table;
@@ -46,7 +46,7 @@ require classfile.fs
 \ **    addr long_info_table;
 \ **    addr double_info_table;
 \ **  }
-\ 
+
 
  0 cells constant jvm_rtcp.classfile
  1 cells constant jvm_rtcp.constpool_table
@@ -83,20 +83,36 @@ require classfile.fs
   ( class_addr)
   jvm_cp_class_name_idx
   ( name_idx)
-  addr swap 
+  addr swap
   ( addr_rtcp name_idx)
   jvm_rtcp.getConstpoolByIdx()
   ( addr_utf8)
   jvm_cp_utf8_c-ref
 ;
 \ FIXME other name?
 
+: jvm_rtcp.getThisClassIdx() ( addr -- idx )
+\ *G get the constant pool index of this class
+  jvm_rtcp.getClassfile() jvm_cf_this_class
+;
+
+: jvm_rtcp.getThisClass() ( addr -- c-addr n )
+\ *G get the this class
+  dup jvm_rtcp.getThisClassIdx()
+  jvm_rtcp.getClassName()
+;
+
+: jvm_rtcp.getSuperClassIdx() ( addr -- idx )
+\ *G get the constant pool index of the super class
+  jvm_rtcp.getClassfile() jvm_cf_super_class
+;
+
 : jvm_rtcp.getNameAndType() { addr idx -- c-addr n }
   addr idx jvm_rtcp.getConstpoolByIdx()
   ( nametype_addr)
   dup jvm_cp_nametype_name_idx
   ( nametype_addr name_idx)
-  addr swap 
+  addr swap
   ( nametype addr_rtcp name_idx)
   jvm_rtcp.getConstpoolByIdx()
   ( nametype addr_utf8)
@@ -108,7 +124,7 @@ require classfile.fs
   ( c-addr n nametype)
   jvm_cp_nametype_desc_idx
   ( c-addr n desc_idx)
-  addr swap 
+  addr swap
   ( c-addr n addr_rtcp desc_idx)
   jvm_rtcp.getConstpoolByIdx()
   ( c-addr n addr_utf8)
@@ -188,8 +204,8 @@ require classfile.fs
   jvm_rtcp.size() allocate throw
   \ dup ." new addr: " . dup ." - " hex. cr
   dup addr swap ( jvm_rtcp.classfile +) ! \ store classfile reference
-  addr jvm_rtcp.createConstPoolTable() 
-  over jvm_rtcp.constpool_table + ! 
+  addr jvm_rtcp.createConstPoolTable()
+  over jvm_rtcp.constpool_table + !
   wordlist over jvm_rtcp.class_info + ! \ store class_info wordlist
   wordlist over jvm_rtcp.fieldref_info + ! \ store fieldref_info wordlist
   wordlist over jvm_rtcp.methodref_info + ! \ store methodref_info wordlist

src/jvm/stack.fs

@@ -17,9 +17,8 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-\ this file implements functionality that is needed to read class files
+
 \ this file contains the implementaion of the JVM Stack
-\ of jvm stack frames
 
 \ ========
 \ *! stack
@@ -128,12 +127,12 @@ jvm_stack.new() constant jvm_stack
 
 \ : jvm_stack.newClass() { c-addr n -- }
 :noname { c-addr n -- }
-  \ ." newClass: " c-addr n type space .s CR
   TRY
     c-addr n jvm_stack.findClass()
     nip \ delete class address
   \ ." class already found: " c-addr n type space .s CR
   IFERROR
+    ." newClass: " c-addr n type CR
     dup
     JVM_WORDNOTFOUND_EXCEPTION = IF
       drop
@@ -182,24 +181,26 @@ jvm_stack.new() constant jvm_stack
 \ jvm_stack.findAndInitClass() { c-addr n -- addr2 woir }
 :noname { c-addr n -- addr2 woir }
 \ *G search for a class an initialize it if needed
-  \ ." jvm_stack.findAndInitClass() " c-addr n type space .s CR
+  ." findAndInitClass: " c-addr n type CR
   c-addr n jvm_stack.findClass() throw
   \ ." jvm_stack.findAndInitClass() begin " .s CR
   dup jvm_class.getStatus()
   \ ." jvm_stack.findAndInitClass() pre case " .s CR
   CASE
     ( addr_cl )
     jvm_class.STATUS:UNINIT OF
-      \ ." class " c-addr n type ."  not prepared: prepare and init" cr
+      ." findAndInitClass " c-addr n type
+      ."  not prepared: prepare and init" CR
       \ .s cr
       dup
       dup
       jvm_default_loader
       c-addr n jvm_search_classpath throw
       \ ." search classpath" .s cr
       jvm_class.prepare() throw
-      jvm_stack.loadClasses()
       \ ." class prepare" .s cr
+      jvm_stack.loadClasses()
+      \ ." class loadClasses" .s cr
       dup
       jvm_class.init()
       \ ." throw" .s cr