Skip to content

JACOBIN-892 correct ParamSlots value in MethodSignature entries #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
platypusguy merged 1 commit into from
Apr 11, 2026
Merged

JACOBIN-892 correct ParamSlots value in MethodSignature entries #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gfunction/javaLang/javaLangObject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func Load_Lang_Object() {
ghelpers.GMeth{ParamSlots: 0, GFunction: ObjectGetClass} // TODO: finish implementing objectGetClass

ghelpers.MethodSignatures["java/lang/Object.getResourceAsStream(Ljava/lang/String;)Ljava/io/InputStream;"] =
ghelpers.GMeth{ParamSlots: 0, GFunction: ghelpers.TrapFunction}
ghelpers.GMeth{ParamSlots: 1, GFunction: ghelpers.TrapFunction}

ghelpers.MethodSignatures["java/lang/Object.hashCode()I"] =
ghelpers.GMeth{ParamSlots: 0, GFunction: objectHashCode}
Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaLang/javaLangThread.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ func Load_Lang_Thread() {
ghelpers.GMeth{ParamSlots: 0, GFunction: ghelpers.TrapDeprecated}

ghelpers.MethodSignatures["java/lang/Thread.run()V"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: threadRun}
ghelpers.GMeth{ParamSlots: 0, GFunction: threadRun}

ghelpers.MethodSignatures["java/lang/Thread.setContextClassLoader(Ljava/lang/ClassLoader;)V"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ghelpers.TrapFunction}
Expand Down
8 changes: 4 additions & 4 deletions src/gfunction/javaSecurity/javaSecurityECFieldAndPoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ func Load_ECFieldAndPoint() {
ghelpers.MethodSignatures["java/security/spec/ECField.<init>(I)V"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecFieldInit}
ghelpers.MethodSignatures["java/security/spec/ECField.getFieldSize()I"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecFieldGetFieldSize}
ghelpers.GMeth{ParamSlots: 0, GFunction: ecFieldGetFieldSize}

// --------------------------
// ECFieldFp
// --------------------------
ghelpers.MethodSignatures["java/security/spec/ECFieldFp.<init>(Ljava/math/BigInteger;)V"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecFieldFpInit}
ghelpers.MethodSignatures["java/security/spec/ECFieldFp.getP()Ljava/math/BigInteger;"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecFieldFpGetP}
ghelpers.GMeth{ParamSlots: 0, GFunction: ecFieldFpGetP}

// --------------------------
// ECPoint
// --------------------------
ghelpers.MethodSignatures["java/security/spec/ECPoint.<init>(Ljava/math/BigInteger;Ljava/math/BigInteger;)V"] =
ghelpers.GMeth{ParamSlots: 2, GFunction: ecPointInit}
ghelpers.MethodSignatures["java/security/spec/ECPoint.getAffineX()Ljava/math/BigInteger;"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecPointGetAffineX}
ghelpers.GMeth{ParamSlots: 0, GFunction: ecPointGetAffineX}
ghelpers.MethodSignatures["java/security/spec/ECPoint.getAffineY()Ljava/math/BigInteger;"] =
ghelpers.GMeth{ParamSlots: 1, GFunction: ecPointGetAffineY}
ghelpers.GMeth{ParamSlots: 0, GFunction: ecPointGetAffineY}
}

// ---------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions src/gfunction/javaSecurity/javaSecurityEllipticCurve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ func Load_EllipticCurve() {
// Getter for field
ghelpers.MethodSignatures["java/security/spec/EllipticCurve.getField()Ljava/security/spec/ECField;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ellipticCurveGetField,
}

// Getter for a
ghelpers.MethodSignatures["java/security/spec/EllipticCurve.getA()Ljava/math/BigInteger;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ellipticCurveGetA,
}

// Getter for b
ghelpers.MethodSignatures["java/security/spec/EllipticCurve.getB()Ljava/math/BigInteger;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ellipticCurveGetB,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaSecurity/javaSecuritySecureRandom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func Load_Security_SecureRandom() {

ghelpers.MethodSignatures["java/security/SecureRandom.nextBoolean()Z"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: secureRandomNextBoolean,
}

Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaUtil/javaUtilProperties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func Load_Util_Properties() {

ghelpers.MethodSignatures["java/util/Properties.propertyNames()Ljava/util/Enumeration;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}

Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaUtil/javaUtilTimeZone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func Load_Util_TimeZone() {

ghelpers.MethodSignatures["java/util/TimeZone.getOffset(IIIII)I"] =
ghelpers.GMeth{
ParamSlots: 6,
ParamSlots: 5,
GFunction: tzGetOffset,
}

Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaUtil/javaUtilTimeZone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestTimeZone_MethodRegistration(t *testing.T) {
{"java/util/TimeZone.getDisplayName()Ljava/lang/String;", 0},
{"java/util/TimeZone.getDSTSavings()I", 0},
{"java/util/TimeZone.getID()Ljava/lang/String;", 0},
{"java/util/TimeZone.getOffset(IIIII)I", 6},
{"java/util/TimeZone.getOffset(IIIII)I", 5},
{"java/util/TimeZone.getOffset(J)I", 1},
{"java/util/TimeZone.getRawOffset()I", 0},
{"java/util/TimeZone.getTimeZone(Ljava/lang/String;)Ljava/util/TimeZone;", 1},
Expand Down
2 changes: 1 addition & 1 deletion src/gfunction/javaxCrypto/javaxCryptoKeyAgreement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func Load_Crypto_KeyAgreement() {

ghelpers.MethodSignatures["javax/crypto/KeyAgreement.generateSecret(Ljava/lang/String;)Ljavax/crypto/SecretKey;"] =
ghelpers.GMeth{
ParamSlots: 2,
ParamSlots: 1,
GFunction: ghelpers.TrapFunction,
}

Expand Down
12 changes: 6 additions & 6 deletions src/gfunction/misc/javaxNetSslSslcontext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,37 +44,37 @@ func Load_Javax_Net_Ssl_SSLContext() {

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineCreateSSLEngine()Ljavax/net/ssl/SSLEngine;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineCreateSSLEngine(Ljava/lang/String;I)Ljavax/net/ssl/SSLEngine;"] =
ghelpers.GMeth{
ParamSlots: 3,
ParamSlots: 2,
GFunction: ghelpers.TrapFunction,
}

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineGetClientSessionContext()Ljavax/net/ssl/SSLSessionContext;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineGetServerSessionContext()Ljavax/net/ssl/SSLSessionContext;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineGetSocketFactory()Ljavax/net/ssl/SSLSocketFactory;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}

ghelpers.MethodSignatures["javax/net/ssl/SSLContext.engineGetServerSocketFactory()Ljavax/net/ssl/SSLServerSocketFactory;"] =
ghelpers.GMeth{
ParamSlots: 1,
ParamSlots: 0,
GFunction: ghelpers.TrapFunction,
}
ghelpers.MethodSignatures["javax/net/ssl/SSLContext.getClientSessionContext()Ljavax/net/ssl/SSLSessionContext;"] =
Expand Down