diff --git a/include/asm/section.hpp b/include/asm/section.hpp index 913bfef4..1ed43a76 100644 --- a/include/asm/section.hpp +++ b/include/asm/section.hpp @@ -97,6 +97,7 @@ void sect_WordString(std::vector const &str); void sect_LongString(std::vector const &str); void sect_Skip(uint32_t skip, bool ds); void sect_RelByte(Expression const &expr, uint32_t pcShift); +void sect_RelSignedByte(Expression const &expr, uint32_t pcShift); void sect_RelBytes(uint32_t n, std::vector const &exprs); void sect_RelWord(Expression const &expr, uint32_t pcShift); void sect_RelLong(Expression const &expr, uint32_t pcShift); diff --git a/include/linkdefs.hpp b/include/linkdefs.hpp index 0317105f..7498ec54 100644 --- a/include/linkdefs.hpp +++ b/include/linkdefs.hpp @@ -130,6 +130,7 @@ enum PatchType { PATCHTYPE_WORD, PATCHTYPE_LONG, PATCHTYPE_JR, + PATCHTYPE_SIGNED_BYTE, PATCHTYPE_INVALID }; diff --git a/src/asm/parser.y b/src/asm/parser.y index 2c5f43b7..bc32d9c5 100644 --- a/src/asm/parser.y +++ b/src/asm/parser.y @@ -1928,7 +1928,7 @@ sm83_add: } | SM83_ADD MODE_SP COMMA reloc_8bit_signed { sect_ConstByte(0xE8); - sect_RelByte($4, 1); + sect_RelSignedByte($4, 1); sym_IncrementCYCLESValue(4); } ; @@ -2168,7 +2168,7 @@ sm83_ld: sm83_ld_hl: SM83_LD MODE_HL COMMA MODE_SP op_sp_offset { sect_ConstByte(0xF8); - sect_RelByte($5, 1); + sect_RelSignedByte($5, 1); sym_IncrementCYCLESValue(3); } | SM83_LD MODE_HL COMMA reloc_16bit { diff --git a/src/asm/section.cpp b/src/asm/section.cpp index 1e8349bf..04611fac 100644 --- a/src/asm/section.cpp +++ b/src/asm/section.cpp @@ -911,6 +911,19 @@ void sect_RelByte(Expression const &expr, uint32_t pcShift) { } } +void sect_RelSignedByte(Expression const &expr, uint32_t pcShift) { + if (!requireCodeSection()) { + return; + } + + if (!expr.isKnown()) { + createPatch(PATCHTYPE_SIGNED_BYTE, expr, pcShift); + writeByte(0); + } else { + writeByte(expr.value()); + } +} + void sect_RelBytes(uint32_t n, std::vector const &exprs) { if (!requireCodeSection()) { return; diff --git a/src/link/patch.cpp b/src/link/patch.cpp index 8e96c6b7..adf2f481 100644 --- a/src/link/patch.cpp +++ b/src/link/patch.cpp @@ -557,6 +557,23 @@ static void checkPatchSize(Expression const &expr, int32_t v, uint8_t n) { } } +static void checkSignedPatchSize(Expression const &expr, int32_t v, uint8_t n) { + assume(n != 0); // That doesn't make sense + assume(n < CHAR_BIT * sizeof(int) - 1); // Otherwise `1 << n` is UB + + if (v < -(1 << (n - 1)) || v >= 1 << (n - 1)) { + if (v < 0) { + diagnosticAt( + expr, WARNING_TRUNCATION_1, "Value -$%" PRIx32 " is not signed %u-bit", -v, n + ); + } else { + diagnosticAt( + expr, WARNING_TRUNCATION_1, "Value $%" PRIx32 " is not signed %u-bit", v, n + ); + } + } +} + // Applies all of a section's patches to a data section static void applyFilePatches(Section §ion, Section &dataSection) { verbosePrint(VERB_INFO, "Patching section \"%s\"...\n", section.name.c_str()); @@ -569,6 +586,7 @@ static void applyFilePatches(Section §ion, Section &dataSection) { 2, // PATCHTYPE_WORD 4, // PATCHTYPE_LONG 1, // PATCHTYPE_JR + 1, // PATCHTYPE_SIGNED_BYTE }; uint8_t typeSize = typeSizes[patch.type]; @@ -607,7 +625,9 @@ static void applyFilePatches(Section §ion, Section &dataSection) { } } else { // Patch a certain number of bytes - if (typeSize < sizeof(int)) { + if (patch.type == PATCHTYPE_SIGNED_BYTE) { + checkSignedPatchSize(patch.rpn, value, typeSize * 8); + } else if (typeSize < sizeof(int)) { checkPatchSize(patch.rpn, value, typeSize * 8); } for (uint8_t i = 0; i < typeSize; ++i) { diff --git a/test/link/signed-byte-bad.asm b/test/link/signed-byte-bad.asm new file mode 100644 index 00000000..77d72395 --- /dev/null +++ b/test/link/signed-byte-bad.asm @@ -0,0 +1,13 @@ +SECTION "limit", ROM0, ALIGN[8, 128] +Limit: +add sp, Limit +add sp, -Limit +ld hl, sp + Limit +ld hl, sp - Limit + +SECTION "test", ROMX +Invalid: +add sp, Invalid +add sp, -Invalid +ld hl, sp + Invalid +ld hl, sp - Invalid diff --git a/test/link/signed-byte-bad.out b/test/link/signed-byte-bad.out new file mode 100644 index 00000000..403b361c --- /dev/null +++ b/test/link/signed-byte-bad.out @@ -0,0 +1,12 @@ +warning: Value $80 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(3) +warning: Value $80 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(5) +warning: Value $4000 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(10) +warning: Value -$4000 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(11) +warning: Value $4000 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(12) +warning: Value -$4000 is not signed 8-bit [-Wtruncation] + at signed-byte-bad.asm(13) diff --git a/test/link/signed-byte.asm b/test/link/signed-byte.asm new file mode 100644 index 00000000..93277cea --- /dev/null +++ b/test/link/signed-byte.asm @@ -0,0 +1,6 @@ +SECTION "test", ROM0, ALIGN[8, 127] +Valid: +add sp, Valid +add sp, -Valid +ld hl, sp + Valid +ld hl, sp - Valid diff --git a/test/link/signed-byte.out b/test/link/signed-byte.out new file mode 100644 index 00000000..e69de29b diff --git a/test/link/signed-byte.out.bin b/test/link/signed-byte.out.bin new file mode 100644 index 00000000..a1596eff Binary files /dev/null and b/test/link/signed-byte.out.bin differ