Skip to content

Commit

Permalink
Remove unintentional write to IE during IntrMain
Browse files Browse the repository at this point in the history
  • Loading branch information
@loveemu
loveemu committed May 18, 2021
1 parent 00e5288 commit ae7ba1e
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 43 deletions.
2 changes: 0 additions & 2 deletions asm/crt0.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ IntrMain:
bne . @ spin
IntrMain_FoundIntr:
strh r0, [r3, #OFFSET_REG_IF - OFFSET_REG_IE]
mov r1, 0x8
strh r1, [r3, #OFFSET_REG_IE - OFFSET_REG_IE]
mrs r3, cpsr
bic r3, r3, #PSR_I_BIT | PSR_F_BIT | PSR_MODE_MASK
orr r3, r3, #PSR_SYS_MODE
Expand Down
82 changes: 41 additions & 41 deletions src/gaxtapper/gax_driver.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ namespace gaxtapper {

class GaxDriver {
public:
static constexpr agbsize_t kGax2ParamsSfxOffset = 0x144;
static constexpr agbsize_t kGax2NewOffset = 0x1dc;
static constexpr agbsize_t kGax2InitOffset = 0x1e0;
static constexpr agbsize_t kGaxIrqOffset = 0x1e4;
static constexpr agbsize_t kGaxPlayOffset = 0x1e8;
static constexpr agbsize_t kMyGaxSfxOffset = 0x1ec;

static constexpr agbsize_t kMinigsfParamBase = 0x1f0;
static constexpr agbsize_t kGax2ParamsSfxOffset = 0x144 - 8;
static constexpr agbsize_t kGax2NewOffset = 0x1dc - 8;
static constexpr agbsize_t kGax2InitOffset = 0x1e0 - 8;
static constexpr agbsize_t kGaxIrqOffset = 0x1e4 - 8;
static constexpr agbsize_t kGaxPlayOffset = 0x1e8 - 8;
static constexpr agbsize_t kMyGaxSfxOffset = 0x1ec - 8;

static constexpr agbsize_t kMinigsfParamBase = 0x1f0 - 8;
static constexpr agbsize_t kMinigsfParamMySongOffset = 0;
static constexpr agbsize_t kMinigsfParamMyFlagsOffset = 0x4;
static constexpr agbsize_t kMinigsfParamMyMixingRateOffset = 0x8;
Expand Down Expand Up @@ -53,50 +53,50 @@ class GaxDriver {
std::ostream& stream, const std::vector<GaxSongHeader>& songs);

private:
static constexpr unsigned char gsf_driver_block[0x204] = {
static constexpr unsigned char gsf_driver_block[0x1FC] = {
0x12, 0x00, 0xA0, 0xE3, 0x00, 0xF0, 0x29, 0xE1, 0x30, 0xD0, 0x9F, 0xE5,
0x1F, 0x00, 0xA0, 0xE3, 0x00, 0xF0, 0x29, 0xE1, 0x20, 0xD0, 0x9F, 0xE5,
0x24, 0x10, 0x9F, 0xE5, 0x28, 0x00, 0x8F, 0xE2, 0x00, 0x00, 0x81, 0xE5,
0xFF, 0x00, 0xA0, 0xE3, 0x00, 0x00, 0x01, 0xEF, 0x14, 0x10, 0x9F, 0xE5,
0x0F, 0xE0, 0xA0, 0xE1, 0x11, 0xFF, 0x2F, 0xE1, 0xF0, 0xFF, 0xFF, 0xEA,
0x00, 0x7F, 0x00, 0x03, 0xA0, 0x7F, 0x00, 0x03, 0xFC, 0x7F, 0x00, 0x03,
0xB1, 0x01, 0x00, 0x08, 0x01, 0x33, 0xA0, 0xE3, 0x02, 0x3C, 0x83, 0xE2,
0xA9, 0x01, 0x00, 0x08, 0x01, 0x33, 0xA0, 0xE3, 0x02, 0x3C, 0x83, 0xE2,
0x00, 0x20, 0x93, 0xE5, 0xB8, 0x10, 0xD3, 0xE1, 0x00, 0x00, 0x4F, 0xE1,
0x0F, 0x40, 0x2D, 0xE9, 0x00, 0x00, 0xA0, 0xE3, 0xB8, 0x00, 0xC3, 0xE1,
0x22, 0x18, 0x02, 0xE0, 0x00, 0xC0, 0xA0, 0xE3, 0x01, 0x00, 0x11, 0xE2,
0x03, 0x00, 0x00, 0x1A, 0x04, 0xC0, 0x8C, 0xE2, 0x02, 0x0A, 0x11, 0xE2,
0x7C, 0x01, 0x43, 0x15, 0xFE, 0xFF, 0xFF, 0x1A, 0xB2, 0x00, 0xC3, 0xE1,
0x08, 0x10, 0xA0, 0xE3, 0xB0, 0x10, 0xC3, 0xE1, 0x00, 0x30, 0x0F, 0xE1,
0xDF, 0x30, 0xC3, 0xE3, 0x1F, 0x30, 0x83, 0xE3, 0x03, 0xF0, 0x29, 0xE1,
0x38, 0x10, 0x8F, 0xE2, 0x0C, 0x10, 0x81, 0xE0, 0x00, 0x00, 0x91, 0xE5,
0x00, 0x40, 0x2D, 0xE9, 0x00, 0xE0, 0x8F, 0xE2, 0x10, 0xFF, 0x2F, 0xE1,
0x00, 0x40, 0xBD, 0xE8, 0x00, 0x30, 0x0F, 0xE1, 0xDF, 0x30, 0xC3, 0xE3,
0x92, 0x30, 0x83, 0xE3, 0x03, 0xF0, 0x29, 0xE1, 0x0F, 0x40, 0xBD, 0xE8,
0xB0, 0x20, 0xC3, 0xE1, 0xB8, 0x10, 0xC3, 0xE1, 0x00, 0xF0, 0x69, 0xE1,
0x1E, 0xFF, 0x2F, 0xE1, 0x7D, 0x02, 0x00, 0x08, 0x79, 0x02, 0x00, 0x08,
0xF0, 0xB5, 0x90, 0xB0, 0x1C, 0x4F, 0x1D, 0x49, 0xB9, 0x80, 0x04, 0xA3,
0x80, 0x20, 0x44, 0x04, 0x18, 0x68, 0xA0, 0x42, 0x10, 0xDD, 0x04, 0x33,
0xFA, 0xE7, 0x00, 0x00, 0x47, 0x61, 0x78, 0x74, 0x61, 0x70, 0x70, 0x65,
0x72, 0x20, 0x30, 0x2E, 0x30, 0x31, 0x20, 0xA9, 0x20, 0x6C, 0x6F, 0x76,
0x65, 0x65, 0x6D, 0x75, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x46, 0x20, 0x00,
0x00, 0xF0, 0x4E, 0xF8, 0x30, 0x48, 0xE0, 0x81, 0x30, 0x48, 0x20, 0x81,
0x60, 0x81, 0x30, 0x48, 0x60, 0x82, 0x00, 0x20, 0x20, 0x82, 0x2A, 0x48,
0x30, 0x23, 0x1B, 0x19, 0x18, 0x60, 0x29, 0x48, 0x04, 0x33, 0x18, 0x60,
0x07, 0x48, 0x60, 0x60, 0x07, 0x48, 0x20, 0x60, 0x20, 0x00, 0x00, 0xF0,
0x39, 0xF8, 0x00, 0xF0, 0x0B, 0xF8, 0x02, 0xDF, 0xFD, 0xE7, 0x00, 0x00,
0x00, 0x02, 0x00, 0x04, 0x14, 0x40, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00,
0xA4, 0x00, 0x00, 0x03, 0x10, 0xB5, 0x09, 0x4C, 0x09, 0x48, 0x21, 0x00,
0x09, 0x4A, 0x00, 0xF0, 0x3D, 0xF8, 0x09, 0x48, 0x04, 0x60, 0x09, 0x4A,
0x09, 0x4B, 0x01, 0x21, 0x19, 0x81, 0x19, 0x80, 0x08, 0x20, 0x90, 0x80,
0x10, 0xBC, 0x01, 0xBC, 0x00, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
0x0C, 0x01, 0x00, 0x08, 0x29, 0x00, 0x00, 0x04, 0xFC, 0x7F, 0x00, 0x03,
0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x70, 0x47, 0x00, 0x00,
0x00, 0xB5, 0x00, 0xF0, 0x09, 0xF8, 0x00, 0xF0, 0x09, 0xF8, 0x01, 0xBC,
0x00, 0x47, 0x00, 0x00, 0x03, 0x49, 0x08, 0x47, 0x03, 0x49, 0x08, 0x47,
0x03, 0x48, 0x00, 0x47, 0x03, 0x48, 0x00, 0x47, 0x79, 0x02, 0x00, 0x08,
0x79, 0x02, 0x00, 0x08, 0x79, 0x02, 0x00, 0x08, 0x79, 0x02, 0x00, 0x08,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x0B, 0xDF, 0x70, 0x47};
0x00, 0x30, 0x0F, 0xE1, 0xDF, 0x30, 0xC3, 0xE3, 0x1F, 0x30, 0x83, 0xE3,
0x03, 0xF0, 0x29, 0xE1, 0x38, 0x10, 0x8F, 0xE2, 0x0C, 0x10, 0x81, 0xE0,
0x00, 0x00, 0x91, 0xE5, 0x00, 0x40, 0x2D, 0xE9, 0x00, 0xE0, 0x8F, 0xE2,
0x10, 0xFF, 0x2F, 0xE1, 0x00, 0x40, 0xBD, 0xE8, 0x00, 0x30, 0x0F, 0xE1,
0xDF, 0x30, 0xC3, 0xE3, 0x92, 0x30, 0x83, 0xE3, 0x03, 0xF0, 0x29, 0xE1,
0x0F, 0x40, 0xBD, 0xE8, 0xB0, 0x20, 0xC3, 0xE1, 0xB8, 0x10, 0xC3, 0xE1,
0x00, 0xF0, 0x69, 0xE1, 0x1E, 0xFF, 0x2F, 0xE1, 0x75, 0x02, 0x00, 0x08,
0x71, 0x02, 0x00, 0x08, 0xF0, 0xB5, 0x90, 0xB0, 0x1C, 0x4F, 0x1D, 0x49,
0xB9, 0x80, 0x04, 0xA3, 0x80, 0x20, 0x44, 0x04, 0x18, 0x68, 0xA0, 0x42,
0x10, 0xDD, 0x04, 0x33, 0xFA, 0xE7, 0x00, 0x00, 0x47, 0x61, 0x78, 0x74,
0x61, 0x70, 0x70, 0x65, 0x72, 0x20, 0x30, 0x2E, 0x30, 0x31, 0x20, 0xA9,
0x20, 0x6C, 0x6F, 0x76, 0x65, 0x65, 0x6D, 0x75, 0x00, 0x00, 0x00, 0x00,
0x6C, 0x46, 0x20, 0x00, 0x00, 0xF0, 0x4E, 0xF8, 0x30, 0x48, 0xE0, 0x81,
0x30, 0x48, 0x20, 0x81, 0x60, 0x81, 0x30, 0x48, 0x60, 0x82, 0x00, 0x20,
0x20, 0x82, 0x2A, 0x48, 0x30, 0x23, 0x1B, 0x19, 0x18, 0x60, 0x29, 0x48,
0x04, 0x33, 0x18, 0x60, 0x07, 0x48, 0x60, 0x60, 0x07, 0x48, 0x20, 0x60,
0x20, 0x00, 0x00, 0xF0, 0x39, 0xF8, 0x00, 0xF0, 0x0B, 0xF8, 0x02, 0xDF,
0xFD, 0xE7, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x14, 0x40, 0x00, 0x00,
0x00, 0x18, 0x00, 0x00, 0xA4, 0x00, 0x00, 0x03, 0x10, 0xB5, 0x09, 0x4C,
0x09, 0x48, 0x21, 0x00, 0x09, 0x4A, 0x00, 0xF0, 0x3D, 0xF8, 0x09, 0x48,
0x04, 0x60, 0x09, 0x4A, 0x09, 0x4B, 0x01, 0x21, 0x19, 0x81, 0x19, 0x80,
0x08, 0x20, 0x90, 0x80, 0x10, 0xBC, 0x01, 0xBC, 0x00, 0x47, 0x00, 0x00,
0x00, 0x00, 0x00, 0x03, 0x0C, 0x01, 0x00, 0x08, 0x29, 0x00, 0x00, 0x04,
0xFC, 0x7F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04,
0x70, 0x47, 0x00, 0x00, 0x00, 0xB5, 0x00, 0xF0, 0x09, 0xF8, 0x00, 0xF0,
0x09, 0xF8, 0x01, 0xBC, 0x00, 0x47, 0x00, 0x00, 0x03, 0x49, 0x08, 0x47,
0x03, 0x49, 0x08, 0x47, 0x03, 0x48, 0x00, 0x47, 0x03, 0x48, 0x00, 0x47,
0x71, 0x02, 0x00, 0x08, 0x71, 0x02, 0x00, 0x08, 0x71, 0x02, 0x00, 0x08,
0x71, 0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
0x0B, 0xDF, 0x70, 0x47};

static GaxVersion ParseVersionText(std::string_view version_text);
static std::string FindGaxVersionText(std::string_view rom,
Expand Down

0 comments on commit ae7ba1e

Please sign in to comment.