JACOBIN-345 Initial logic for adding a method table to classes

platypusguy · Sep 1, 2023 · 7819158 · 7819158
1 parent 61d2f9c
commit 7819158
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/classloader/classes.go b/src/classloader/classes.go
@@ -21,19 +21,20 @@ type Klass struct {
 }
 
 type ClData struct {
-	Name       string
-	Superclass string
-	Module     string
-	Pkg        string   // package name, if any. (so named, b/c 'package' is a golang keyword)
-	Interfaces []uint16 // indices into UTF8Refs
-	Fields     []Field
-	Methods    []Method
-	Attributes []Attr
-	SourceFile string
-	Bootstraps []BootstrapMethod
-	CP         CPool
-	Access     AccessFlags
-	ClInit     byte // 0 = no clinit, 1 = clinit not run, 2 clinit run
+	Name        string
+	Superclass  string
+	Module      string
+	Pkg         string   // package name, if any. (so named, b/c 'package' is a golang keyword)
+	Interfaces  []uint16 // indices into UTF8Refs
+	Fields      []Field
+	MethodTable map[string]*Method
+	Methods     []Method
+	Attributes  []Attr
+	SourceFile  string
+	Bootstraps  []BootstrapMethod
+	CP          CPool
+	Access      AccessFlags
+	ClInit      byte // 0 = no clinit, 1 = clinit not run, 2 clinit run
 }
 
 type CPool struct {

diff --git a/src/classloader/classloader.go b/src/classloader/classloader.go
@@ -477,11 +477,14 @@ func convertToPostableClass(fullyParsedClass *ParsedClass) ClData {
 		}
 	}
 
+	kd.MethodTable = make(map[string]*Method)
 	if len(fullyParsedClass.methods) > 0 {
 		for i := 0; i < len(fullyParsedClass.methods); i++ {
 			kdm := Method{}
 			kdm.Name = uint16(fullyParsedClass.methods[i].name)
+			methName := fullyParsedClass.utf8Refs[int(kdm.Name)].content
 			kdm.Desc = uint16(fullyParsedClass.methods[i].description)
+			methDesc := fullyParsedClass.utf8Refs[int(kdm.Desc)].content
 			kdm.AccessFlags = fullyParsedClass.methods[i].accessFlags
 			kdm.CodeAttr.MaxStack = fullyParsedClass.methods[i].codeAttr.maxStack
 			kdm.CodeAttr.MaxLocals = fullyParsedClass.methods[i].codeAttr.maxLocals
@@ -531,8 +534,12 @@ func convertToPostableClass(fullyParsedClass *ParsedClass) ClData {
 			}
 			kdm.Deprecated = fullyParsedClass.methods[i].deprecated
 			kd.Methods = append(kd.Methods, kdm)
+
+			methodTableKey := methName + methDesc
+			kd.MethodTable[methodTableKey] = &kdm
 		}
 	}
+
 	if len(fullyParsedClass.attributes) > 0 {
 		for i := 0; i < len(fullyParsedClass.attributes); i++ {
 			kda := Attr{