drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia] Make almost everyting noexcept

Browse Source
This commit is contained in:
Gary Talent
2021-04-20 01:56:41 -05:00
parent 161780cb91
commit 6ece0b6f9b
22 changed files with 139 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/gba/core.arm.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ extern volatile gba_timer_t g_timerMs;
gba_timer_t g_wakeupTime;
event_handler g_eventHandler = nullptr;
ox::Error run(Context *ctx) {
ox::Error run(Context *ctx) noexcept {
g_wakeupTime = 0;
while (1) {
if (g_wakeupTime <= g_timerMs && g_eventHandler) {
src/nostalgia/core/gba/core.cpp
+6 -6
View File
@@ -27,12 +27,12 @@ extern event_handler g_eventHandler;
extern volatile gba_timer_t g_timerMs;
static void initIrq() {
static void initIrq() noexcept {
REG_ISR = isr;
REG_IME = 1; // enable interrupts
}
static void initTimer() {
static void initTimer() noexcept {
// make timer0 a ~1 millisecond timer
REG_TIMER0 = TicksMs59ns;
REG_TIMER0CTL = 0b11000000;
@@ -40,22 +40,22 @@ static void initTimer() {
REG_IE = REG_IE | Int_timer0;
}
ox::Error init(Context *ctx) {
ox::Error init(Context *ctx) noexcept {
oxReturnError(initGfx(ctx));
initTimer();
initIrq();
return OxError(0);
}
void setEventHandler(event_handler h) {
void setEventHandler(event_handler h) noexcept {
g_eventHandler = h;
}
uint64_t ticksMs() {
uint64_t ticksMs() noexcept {
return g_timerMs;
}
bool buttonDown(Key k) {
bool buttonDown(Key k) noexcept {
return !(REG_GAMEPAD & k);
}
src/nostalgia/core/gba/gfx.cpp
+22 -24
View File
@@ -85,7 +85,7 @@ ox::Error modelRead(T *io, GbaTileMapTarget *t) {
return io->template field<uint8_t, decltype(handleTileMap)>("tileMap", handleTileMap);
}
ox::Error initGfx(Context*) {
ox::Error initGfx(Context*) noexcept {
REG_DISPCTL = DispCtl_Mode0
| DispCtl_SpriteMap1D
| DispCtl_Obj;
@@ -96,42 +96,43 @@ ox::Error initGfx(Context*) {
return OxError(0);
}
ox::Error shutdownGfx(Context*) {
ox::Error shutdownGfx(Context*) noexcept {
return OxError(0);
}
int getScreenWidth(Context*) {
int getScreenWidth(Context*) noexcept {
return 240;
}
int getScreenHeight(Context*) {
int getScreenHeight(Context*) noexcept {
return 160;
}
common::Size getScreenSize(Context*) {
common::Size getScreenSize(Context*) noexcept {
return {240, 160};
}
uint8_t bgStatus(Context*) {
uint8_t bgStatus(Context*) noexcept {
return (REG_DISPCTL >> 8) & 0b1111;
}
void setBgStatus(Context*, uint32_t status) {
void setBgStatus(Context*, uint32_t status) noexcept {
constexpr auto Bg0Status = 8;
REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << Bg0Status;
}
bool bgStatus(Context*, unsigned bg) {
bool bgStatus(Context*, unsigned bg) noexcept {
return (REG_DISPCTL >> (8 + bg)) & 1;
}
void setBgStatus(Context*, unsigned bg, bool status) {
void setBgStatus(Context*, unsigned bg, bool status) noexcept {
constexpr auto Bg0Status = 8;
const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
}
[[nodiscard]] constexpr volatile uint32_t &bgCtl(int bg) noexcept {
[[nodiscard]]
constexpr volatile uint32_t &bgCtl(int bg) noexcept {
switch (bg) {
case 0:
return REG_BG0CTL;
@@ -148,16 +149,13 @@ void setBgStatus(Context*, unsigned bg, bool status) {
}
// Do NOT rely on Context in the GBA version of this function.
ox::Error initConsole(Context *ctx) {
ox::Error initConsole(Context *ctx) noexcept {
constexpr auto TilesheetAddr = "/TileSheets/Charset.ng";
constexpr auto PaletteAddr = "/Palettes/Charset.npal";
setBgStatus(ctx, 0b0001);
if (!ctx) {
ctx = new (ox_alloca(sizeof(Context))) Context();
auto rom = loadRom();
if (!rom) {
return OxError(1);
}
oxRequire(rom, loadRom());
ox::FileStore32 fs(rom, 32 * ox::units::MB);
ctx->rom = new (ox_alloca(sizeof(ox::FileSystem32))) ox::FileSystem32(fs);
}
@@ -167,7 +165,7 @@ ox::Error initConsole(Context *ctx) {
ox::Error loadBgTileSheet(Context *ctx,
int section,
ox::FileAddress tilesheetAddr,
ox::FileAddress paletteAddr) {
ox::FileAddress paletteAddr) noexcept {
oxRequire(tsStat, ctx->rom->stat(tilesheetAddr));
oxRequire(ts, ctx->rom->directAccess(tilesheetAddr));
GbaTileMapTarget target;
@@ -187,7 +185,7 @@ ox::Error loadBgTileSheet(Context *ctx,
ox::Error loadSpriteTileSheet(Context *ctx,
int section,
ox::FileAddress tilesheetAddr,
ox::FileAddress paletteAddr) {
ox::FileAddress paletteAddr) noexcept {
oxRequire(tsStat, ctx->rom->stat(tilesheetAddr));
oxRequire(ts, ctx->rom->directAccess(tilesheetAddr));
GbaTileMapTarget target;
@@ -205,7 +203,7 @@ ox::Error loadSpriteTileSheet(Context *ctx,
return OxError(0);
}
ox::Error loadBgPalette(Context *ctx, int section, ox::FileAddress paletteAddr) {
ox::Error loadBgPalette(Context *ctx, int section, ox::FileAddress paletteAddr) noexcept {
GbaPaletteTarget target;
target.palette = &MEM_BG_PALETTE[section];
oxRequire(palStat, ctx->rom->stat(paletteAddr));
@@ -214,7 +212,7 @@ ox::Error loadBgPalette(Context *ctx, int section, ox::FileAddress paletteAddr)
return OxError(0);
}
ox::Error loadSpritePalette(Context *ctx, int section, ox::FileAddress paletteAddr) {
ox::Error loadSpritePalette(Context *ctx, int section, ox::FileAddress paletteAddr) noexcept {
GbaPaletteTarget target;
target.palette = &MEM_SPRITE_PALETTE[section];
oxRequire(palStat, ctx->rom->stat(paletteAddr));
@@ -224,23 +222,23 @@ ox::Error loadSpritePalette(Context *ctx, int section, ox::FileAddress paletteAd
}
// Do NOT use Context in the GBA version of this function.
void puts(Context *ctx, int column, int row, const char *str) {
void puts(Context *ctx, int column, int row, const char *str) noexcept {
for (int i = 0; str[i]; i++) {
setTile(ctx, 0, column + i, row, static_cast<uint8_t>(charMap[static_cast<int>(str[i])]));
}
}
void setTile(Context*, int layer, int column, int row, uint8_t tile) {
void setTile(Context*, int layer, int column, int row, uint8_t tile) noexcept {
MEM_BG_MAP[layer][row * GbaTileColumns + column] = tile;
}
// Do NOT use Context in the GBA version of this function.
void clearTileLayer(Context*, int layer) {
void clearTileLayer(Context*, int layer) noexcept {
memset(&MEM_BG_MAP[layer], 0, GbaTileRows * GbaTileColumns);
}
[[maybe_unused]]
void hideSprite(Context*, unsigned idx) {
void hideSprite(Context*, unsigned idx) noexcept {
oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
GbaSpriteAttrUpdate oa;
oa.attr0 = 2 << 8;
@@ -269,7 +267,7 @@ void setSprite(Context*,
unsigned tileIdx,
unsigned spriteShape,
unsigned spriteSize,
unsigned flipX) {
unsigned flipX) noexcept {
oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
GbaSpriteAttrUpdate oa;
oa.attr0 = static_cast<uint16_t>(y & ox::onMask<uint8_t>(7))
src/nostalgia/core/gba/media.cpp
+3 -3
View File
@@ -14,7 +14,7 @@
namespace nostalgia::core {
char *loadRom(const char*) {
ox::Result<char*> loadRom(const char*) noexcept {
// put the header in the wrong order to prevent mistaking this code for the
// media section
constexpr auto headerP2 = "_HEADER_________";
@@ -29,10 +29,10 @@ char *loadRom(const char*) {
return current + headerLen;
}
}
return nullptr;
return OxError(1);
}
void unloadRom(char*) {
void unloadRom(char*) noexcept {
}
}
src/nostalgia/core/gba/tests.cpp
+4 -3
View File
@@ -13,11 +13,12 @@
namespace ox::heapmgr {
[[nodiscard]] void *malloc(std::size_t allocSize);
[[nodiscard]]
void *malloc(std::size_t allocSize) noexcept;
void free(void *ptr);
void free(void *ptr) noexcept;
void initHeap(char *heapBegin, char *heapEnd);
void initHeap(char *heapBegin, char *heapEnd) noexcept;
}