Skip to content

Commit 811c326

Browse files
Try and restore the lowcode capability to return int64 result on various 32bits ABI. The ABIResultRegHigh needs to be defined.
*** Hack *** Do not entirely take the regenerated lowcode source from VMMaker.oscog-nice.2709. As there are other changes pending, this may break something else. Instead, just cherry pick the minimal change from the generated code with the goal to let CI pass. We could obtain the exact same result by patching VMMaker.oscog-eem.2705, but this is overkill for a temporary.
1 parent 36a1f1e commit 811c326

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

spurlowcodesrc/vm/cogitARMv5.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
2+
CCodeGenerator VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -24,7 +24,7 @@ char *__cogitBuildInfo = __buildInfo;
2424
/*** Constants ***/
2525
#define ABICallerSavedRegisterMask 0x120F
2626
#define ABIResultReg 0
27-
#undef ABIResultRegHigh
27+
#define ABIResultRegHigh 1
2828
#define AddCqR 104
2929
#define AddCqRR 121
3030
#define AddCwR 112

spurlowcodesrc/vm/cogitIA32.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
2+
CCodeGenerator VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -24,7 +24,7 @@ char *__cogitBuildInfo = __buildInfo;
2424
/*** Constants ***/
2525
#define ABICallerSavedRegisterMask 0x7
2626
#define ABIResultReg 0
27-
#undef ABIResultRegHigh
27+
#define ABIResultRegHigh 2
2828
#define AddCqR 104
2929
#define AddCwR 112
3030
#define AddcCqR 118

spurlowcodesrc/vm/cogitMIPSEL.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
2+
CCodeGenerator VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705 uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2705*-PATCHED uuid: 35875931-68e1-4c94-a7ec-9cf66d27743d " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -29,7 +29,7 @@ char *__cogitBuildInfo = __buildInfo;
2929
#define A3 7
3030
#define ABICallerSavedRegisterMask 0x300FF00
3131
#define ABIResultReg 2
32-
#undef ABIResultRegHigh
32+
#define ABIResultRegHigh 3
3333
#define ADDIU 9
3434
#define ADDU 33
3535
#define AddCheckOverflowCqR 160

0 commit comments

Comments
 (0)