Skip to content

Fix cppia JIT "Bad move target" on untyped register moves #1366

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

Closed
MeguminBOT wants to merge 1 commit into from
Closed

Fix cppia JIT "Bad move target" on untyped register moves #1366

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
6 changes: 3 additions & 3 deletions src/hx/cppia/CppiaCompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ class CppiaJitCompiler : public CppiaCompiler
{
if (inSrc.uses(SLJIT_R1))
{
move(sJitArg0, inSrc);
move(sJitArg0.as(jtInt), inSrc.as(jtInt));
add( sJitTemp1, inTarget.getReg(), inTarget.offset );
callNative( (void *)intToStr, sJitArg0.as(jtInt), sJitTemp1.as(jtPointer));
}
Expand All @@ -917,7 +917,7 @@ class CppiaJitCompiler : public CppiaCompiler
case etObject:
if (inSrc.uses(SLJIT_R1))
{
move(sJitArg0, inSrc);
move(sJitArg0.as(jtPointer), inSrc.as(jtPointer));
add( sJitTemp1, inTarget.getReg(), inTarget.offset );
callNative( (void *)objToStr, sJitArg0.as(jtPointer), sJitTemp1.as(jtPointer) );
}
Expand All @@ -944,7 +944,7 @@ class CppiaJitCompiler : public CppiaCompiler
case etObject:
if (inSrc==sJitTemp1)
{
move(sJitArg0, inSrc);
move(sJitArg0.as(jtPointer), inSrc.as(jtPointer));
makeAddress(sJitTemp1,inTarget);
callNative( (void *)objToFloat, sJitArg0.as(jtPointer), sJitTemp1.as(jtPointer));
}
Expand Down
10 changes: 10 additions & 0 deletions test/cppia/Client.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ class ClientFoo implements IFoo {
}
}

class ClientUntypedMove {

public static function subtractIndexed():String {
var a:Int = 2;
var ints:Array<Int> = [7,8,9];

return "" + (ints[a - 1] - ints[0]);
}
}

class Client
{
public static var clientBool0 = true;
Expand Down
10 changes: 10 additions & 0 deletions test/cppia/cases/TestCommon.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ class TestCommon extends Test {
Assert.equals(2, Common.callbackSet, 'Bad cppia closure');
}

@:depends(testStatus)
function testUntypedRegisterMove() {
final cls = Type.resolveClass('ClientUntypedMove');

if (Assert.notNull(cls, 'Unable to resolve ClientUntypedMove')) {
Assert.equals('1', Std.string(Reflect.callMethod(null, Reflect.field(cls, 'subtractIndexed'), [])),
'Subtracting two array elements into a string did not answer');
}
}

@:depends(testStatus)
function testInterfaceCalling() {
final obj : IFoo = Type.createInstance(Type.resolveClass('ClientFoo'), []);
Expand Down