jvm: refactoring (minor renaming)

Author: zapster

src/jvm-test.fs

@@ -4,5 +4,13 @@ include jvm/jvm.fs  \ include the jvm
 : RunDemo ( -- )
   s" testfiles/" jvm_classpath.add()
   s" Main" jvm_java
+  \ show static values
+  jvm_stack.getCurrentFrame()
+  jvm_frame.getClass()
+  dup s" foo|I" 
+  jvm_class.getStatic() throw
+  ." Main.foo: " hex. CR
+  s" bar|I" jvm_class.getStatic() throw
+  ." Main.bar: " hex. CR
 ;
 

src/jvm/class.fs

@@ -74,18 +74,21 @@ require rtconstpool.fs
 \ ========
 \ 
 \ *C jvm_class {
-\ **    addr rtcp;     \ runtime constant pool
-\ **    wid  fd_idx;   \ static field index wordlist
-\ **    addr fd_table; \ static field table
+\ **    addr status;       \ status of the class
+\ **    addr init_loader;  \ initial loader
+\ **    addr rtcp;         \ runtime constant pool
+\ **    addr super;        \ link to super class
+\ **    wid  filed_offset; \ static field offset wordlist
+\ **    addr field_table;  \ static field table
 \ **  }
 \ 
 
  0 cells constant jvm_class.status
  1 cells constant jvm_class.init_loader
  2 cells constant jvm_class.rtcp
  3 cells constant jvm_class.super
- 4 cells constant jvm_class.fd_idx
- 5 cells constant jvm_class.fd_table
+ 4 cells constant jvm_class.field_offset
+ 5 cells constant jvm_class.field_table
 
  6 cells constant jvm_class.size()
 
@@ -112,58 +115,58 @@ require rtconstpool.fs
 \ *G get the address of the super class
   jvm_class.super + @
 ;
-\ FIXME change idx to offset!
-: jvm_class.getFd_idx_wid() ( addr -- wid )
-\ *G get the wordlist id for the static field index translation
-  jvm_class.fd_idx + @
+
+: jvm_class.getField_offset_wid() ( addr -- wid )
+\ *G get the wordlist id for the static field offset translation
+  jvm_class.field_offset + @
 ;
 
-: jvm_class.getFd_idx() { addr c-addr n -- idx woir }
-\ *G get the index of a static field
-  addr jvm_class.getFd_idx_wid()
+: jvm_class.getField_offset() { addr c-addr n -- off woir }
+\ *G get the offset of a static field
+  addr jvm_class.getField_offset_wid()
   c-addr n rot
   jvm_find_word throw
   0
 ;
 
-: jvm_class.getStaticIdx() { addr idx -- value }
-\ *G get the value of a static field (32bit) by index
-  addr jvm_class.fd_table + idx cells + jvm_field_@
+: jvm_class.getStaticOffset() { addr off -- value }
+\ *G get the value of a static field (32bit) by offset
+  addr jvm_class.field_table + off cells + jvm_field_@
 ;
 
 : jvm_class.getStatic() { addr c-addr n -- value woir }
 \ *G get the value of a static field (32bit) by name
   \ ." trying to get " c-addr n type  CR
-  addr c-addr n jvm_class.getFd_idx() throw
-  \ ." index: " dup . CR
-  addr swap jvm_class.getStaticIdx() 0
+  addr c-addr n jvm_class.getField_offset() throw
+  \ ." offset: " dup . CR
+  addr swap jvm_class.getStaticOffset() 0
 ;
 
-: jvm_class.setStaticIdx() { addr val idx -- }
-\ *G set the value of a static field (32bit) by index
-  val addr jvm_class.fd_table + idx cells +
+: jvm_class.setStaticOffset() { addr val off -- }
+\ *G set the value of a static field (32bit) by offset
+  val addr jvm_class.field_table + off cells +
   jvm_field_!
 ;
 
 : jvm_class.setStatic() { addr val c-addr n -- woir }
 \ *G get the value of a static field (32bit) by name
   \ ." trying to set " c-addr n type  ."  to " val . CR
   addr val 
-  over c-addr n jvm_class.getFd_idx() throw \ get idx
-  \ ." index: " dup . CR
-  jvm_class.setStaticIdx() 
+  over c-addr n jvm_class.getField_offset() throw \ get off
+  \ ." offset: " dup . CR
+  jvm_class.setStaticOffset() 
   0
 ;
 
-: jvm_class.getStatic2Idx() { addr idx -- lsb-value msb-value }
-\ *G get the value of a static field (64bit) by index
-  addr jvm_class.fd_table + idx cells + jvm_field_2@
+: jvm_class.getStatic2Offset() { addr off -- lsb-value msb-value }
+\ *G get the value of a static field (64bit) by offset
+  addr jvm_class.field_table + off cells + jvm_field_2@
 ;
 
 : jvm_class.getStatic2() { addr c-addr n -- lsb-value msb-value wior }
 \ *G get the value of a static field (64bit) by name
-  addr c-addr n jvm_class.getFd_idx() throw
-  addr swap jvm_class.getStatic2Idx() 0
+  addr c-addr n jvm_class.getField_offset() throw
+  addr swap jvm_class.getStatic2Offset() 0
 ;
 
 : jvm_class.new() ( -- addr)
@@ -173,8 +176,8 @@ require rtconstpool.fs
   jvm_class.STATUS:UNINIT over ( jvm_class.status + ) !
   \ 0 over jvm_class.init_loader + !
   \ 0 over jvm_class.rtcp + !
-  wordlist over jvm_class.fd_idx + !
-  \ 0 over jvm_class.fd_table + !
+  wordlist over jvm_class.field_offset + !
+  \ 0 over jvm_class.field_table + !
 ;
 
 : jvm_class.prepare() { addr_cl loader addr_cf -- wior }
@@ -190,28 +193,28 @@ require rtconstpool.fs
   addr_cf jvm_cf_fields_addr
   addr_cf jvm_cf_fields_count
   0 ?DO
-    ( idx addr )
-    \ idx next free index of the table
+    ( off addr )
+    \ off next free offset of the table
     \ addr address of the field entry
     dup ACC_STATIC jvm_fd_?flags IF 
       addr_cf over jvm_fd_identifier
-      ( idx addr c-addr n )
+      ( off addr c-addr n )
       addr_cf jvm_cf_constpool_addr 
-      ( idx addr c-addr n addr2 )
+      ( off addr c-addr n addr2 )
       3 pick jvm_fd_desc_idx 
-      ( idx addr c-addr n addr2 idx2 )
+      ( off addr c-addr n addr2 idx2 )
       jvm_constpool_idx
-      ( idx addr c-addr n addr3 )
+      ( off addr c-addr n addr3 )
       jvm_cp_utf8_c-ref
-      ( idx addr c-addr n c-addr2 n2 )
+      ( off addr c-addr n c-addr2 n2 )
       jvm_field_desc_size -rot
-      ( idx addr size c-addr n )
+      ( off addr size c-addr n )
       4 pick -rot
-      ( idx addr size idx c-addr n )
-      addr_cl jvm_class.getFd_idx_wid() 
-      ( idx addr size idx c-addr n wid )
+      ( off addr size off c-addr n )
+      addr_cl jvm_class.getField_offset_wid() 
+      ( off addr size off c-addr n wid )
       jvm_add_word
-      ( idx addr size )
+      ( off addr size )
       rot + swap 
     ENDIF
 
@@ -222,7 +225,7 @@ require rtconstpool.fs
   allocate throw                                         \ allocate static table memory
   \ TODO Initial values §5.4.2, 1st paragraph
 
-  addr_cl jvm_class.fd_table + !                         \ store table
+  addr_cl jvm_class.field_table + !                         \ store table
 
   jvm_class.STATUS:PREPARED addr_cl jvm_class.status + ! \ store status
   loader addr_cl jvm_class.init_loader + !               \ store loader

src/jvm/execute.fs

@@ -364,7 +364,7 @@ require exception.fs
   dup
   rot
   ( addr_rtcp addr_rtcp idx )
-  jvm_rtcp.getConstpool()
+  jvm_rtcp.getConstpoolByIdx()
   ( addr_rtcp addr_fd )
   over -rot
   ( addr_rtcp addr_rtcp addr_fd )
@@ -884,7 +884,7 @@ require exception.fs
   dup
   rot
   ( addr_rtcp addr_rtcp idx )
-  jvm_rtcp.getConstpool()
+  jvm_rtcp.getConstpoolByIdx()
   ( addr_rtcp addr_fd )
   over -rot
   ( addr_rtcp addr_rtcp addr_fd )

src/jvm/rtconstpool.fs

@@ -48,7 +48,7 @@ require classfile.fs
   ( jvm_rtcp.classfile + ) @
 ;
 
-: jvm_rtcp.getConstpool() { addr idx -- addr2 }
+: jvm_rtcp.getConstpoolByIdx() { addr idx -- addr2 }
 \ *G get the address of the constant pool entry denoted by idx
 \ NOTE no sanity checks (e.g. 0 < idx < constant_pool_count)
   addr jvm_rtcp.constpool_table + @ idx 1- cells + @
@@ -57,26 +57,26 @@ require classfile.fs
 \ FIXME other name?
 : jvm_rtcp.getClassName() { addr idx -- c-addr n }
 \ *G get the qualified classname from a class idx
-  addr idx jvm_rtcp.getConstpool()
+  addr idx jvm_rtcp.getConstpoolByIdx()
   ( class_addr)
   jvm_cp_class_name_idx
   ( name_idx)
   addr swap 
   ( addr_rtcp name_idx)
-  jvm_rtcp.getConstpool()
+  jvm_rtcp.getConstpoolByIdx()
   ( addr_utf8)
   jvm_cp_utf8_c-ref
 ;
 \ FIXME other name?
 : jvm_rtcp.getNameType() { addr idx -- c-addr n }
 \ *G get the qualified NameType from a class idx
-  addr idx jvm_rtcp.getConstpool()
+  addr idx jvm_rtcp.getConstpoolByIdx()
   ( nametype_addr)
   dup jvm_cp_nametype_name_idx
   ( nametype_addr name_idx)
   addr swap 
   ( nametype addr_rtcp name_idx)
-  jvm_rtcp.getConstpool()
+  jvm_rtcp.getConstpoolByIdx()
   ( nametype addr_utf8)
   jvm_cp_utf8_c-ref
   ( nametype c-addr n)
@@ -88,7 +88,7 @@ require classfile.fs
   ( c-addr n desc_idx)
   addr swap 
   ( c-addr n addr_rtcp desc_idx)
-  jvm_rtcp.getConstpool()
+  jvm_rtcp.getConstpoolByIdx()
   ( c-addr n addr_utf8)
   jvm_cp_utf8_c-ref
   ( c-addr n c-addr2 n2)

src/jvm/stack.fs

@@ -148,6 +148,7 @@ jvm_stack.new() constant jvm_stack
 : jvm_stack.invokeInitial() { c-addr n -- wior }
 \ *G Start the execution by invoking public static void main(String[] args)
   \ ." : jvm_stack.invokeInitial() { c-addr n -- wior } " .s CR
+  \ FIXME we need to initialize the super class/interface as well (somewhere)
   assert( depth 0 = )
   c-addr n jvm_stack.findClass() throw
   dup jvm_class.getStatus()

src/unittests/rtconstpool_test.fs

@@ -27,7 +27,7 @@ include ../jvm/rtconstpool.fs
   s" Test.class" jvm_read_classfile throw 
   dup jvm_rtcp.new()
   tuck
-  1 jvm_rtcp.getConstpool() 
+  1 jvm_rtcp.getConstpoolByIdx() 
   swap jvm_cf_constpool_addr
   assert( = )
   \ TODO jvm_rtcp.getClass_info() >order