SecureLang/slcc
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Partial maths fix, div/rem operators now work for 32/64 bit code (should be mirrored in fossil...). Some issues may still remain with different combinations of types/signednesses/operators and won't be fixed on x86 as pervasively as on RV64.

Browse Source
This commit is contained in:
Zak Yani Star Fenton
2025-08-26 18:05:30 +10:00
parent 7f74463109
commit 1e92a65aaa
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ccbgeneric.h
View File

@@ -1826,8 +1826,10 @@ static void ccb_target_gen_binary_arithmetic_integer(ccb_t* ccb, ccb_ast_t* ast)
ccb_target_gen_emit("signx64x32 r0"); ccb_target_gen_emit("signx64x32 r0");
} }
else if (ccb_target_family(ccb) == CCB_ARCH_FAMILY_RISCV) { else if (ccb_target_family(ccb) == CCB_ARCH_FAMILY_RISCV) {
if (ast->left->ctype->size <= 4) {
ccb_target_gen_emit("sext.w a0, a0"); ccb_target_gen_emit("sext.w a0, a0");
} }
}
else if ((ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_FASM || ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_NASM)) { else if ((ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_FASM || ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_NASM)) {
ccb_target_gen_emit("cqo"); ccb_target_gen_emit("cqo");
} }
@@ -1838,11 +1840,15 @@ static void ccb_target_gen_binary_arithmetic_integer(ccb_t* ccb, ccb_ast_t* ast)
ccb_target_gen_emit("div r0, r2, r1"); ccb_target_gen_emit("div r0, r2, r1");
} }
else if (ccb_target_family(ccb) == CCB_ARCH_FAMILY_RISCV) { else if (ccb_target_family(ccb) == CCB_ARCH_FAMILY_RISCV) {
if (ast->ctype->size == 8) {
ccb_target_gen_emit("%s a0, a0, a1", ast->type == '%' ? "rem" : "div"); ccb_target_gen_emit("%s a0, a0, a1", ast->type == '%' ? "rem" : "div");
} else {
ccb_target_gen_emit("%s a0, a0, a1", ast->type == '%' ? "remw" : "divw");
//if (ast->type != '%'){ //if (ast->type != '%'){
ccb_target_gen_emit("sext.w a0, a0"); ccb_target_gen_emit("sext.w a0, a0");
//} //}
} }
}
else if ((ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_FASM || ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_NASM)) { else if ((ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_FASM || ccb_target_asmfmt(ccb) == CCB_TARGET_ASMFMT_NASM)) {
ccb_target_gen_emit("idiv rcx"); ccb_target_gen_emit("idiv rcx");
} }