drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

Add more complete implementation for custom new/delete, add panic

Browse Source
This commit is contained in:
Gary Talent 2017-10-14 03:13:26 -05:00
parent dd4556e4e1
commit 70cee81406
15 changed files with 293 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -15,7 +15,7 @@ endif
make:
${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV}
build_rom:
build-rom:
${ENV_RUN} ${MAKE} -j -C build ARGS="install" HOST_ENV=${HOST_ENV}
${ENV_RUN} ${MAKE} -j -C build HOST_ENV=${HOST_ENV}
${ENV_RUN} ./scripts/build_rom.sh
@ -34,8 +34,8 @@ run: install
./dist/current/bin/nostalgia -debug
run-studio: install
./dist/current/bin/nostalgia-studio -profile dist/current/share/nostalgia-studio.json
gba-run: make
mgba-qt build/current/nostalgia.bin
gba-run: build-rom
mgba-qt nostalgia.gba
gdb: make
gdb ./build/current/src/wombat/wombat
gdb-studio: make

21
scripts/build_rom.sh
View File

@ -2,12 +2,19 @@
set -e
echo NOSTALGIA_MEDIA_HEADER_________ > media_header.txt
BIN=./dist/current/bin/
NOSTALGA_BIN=build/gba-release/src/nostalgia/player/nostalgia.bin
NOSTALGA_MEDIA=nostalgia_media.oxfs
NOSTALGA_GBA=nostalgia.gba
MEDIA_HEADER=media_header.txt
CHARSET_FILE=src/nostalgia/core/studio/charset.png
./dist/current/bin/oxfs format 32 1k nostalgia_media.oxfs
./dist/current/bin/nost-pack -fs nostalgia_media.oxfs -img charset.png -inode 101 -tiles 40 -bpp 4 -c
echo NOSTALGIA_MEDIA_HEADER_________ > $MEDIA_HEADER
${DEVKITARM}/bin/padbin 32 build/gba-release/nostalgia.bin
cat build/gba-release/nostalgia.bin media_header.txt nostalgia_media.oxfs > nostalgia.gba
rm -f media_header.txt
${DEVKITARM}/bin/gbafix nostalgia.gba
$BIN/oxfs format 32 1k $NOSTALGA_MEDIA
$BIN/nost-pack -fs $NOSTALGA_MEDIA -img $CHARSET_FILE -inode 101 -tiles 127 -bpp 4 -c
${DEVKITARM}/bin/padbin 32 $NOSTALGA_BIN
cat $NOSTALGA_BIN $MEDIA_HEADER $NOSTALGA_MEDIA > $NOSTALGA_GBA
rm -f $MEDIA_HEADER $NOSTALGA_MEDIA
${DEVKITARM}/bin/gbafix $NOSTALGA_GBA

2
src/nostalgia/core/CMakeLists.txt
View File

@ -7,6 +7,7 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA")
gba/gfx.cpp
gba/media.cpp
gba/mem.cpp
gba/panic.cpp
)
elseif(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -15,6 +16,7 @@ elseif(NOSTALGIA_BUILD_TYPE STREQUAL "Native")
set(
CPP
qt/gfx.cpp
userland/mem.cpp
)
endif()

2
src/nostalgia/core/core.cpp
View File

@ -6,6 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "mem.hpp"
#include "core.hpp"
namespace nostalgia {
@ -14,6 +15,7 @@ namespace core {
ox::Error init(Context *ctx) {
ox::Error err = 0;
err = initGfx(ctx);
initHeap(); // this does nothing in userland builds
return err;
}

3
src/nostalgia/core/gba/addresses.hpp
View File

@ -46,3 +46,6 @@ typedef uint16_t BgMapTile[1024];
#define MEM_BG_MAP ((BgMapTile*) 0x06000000)
#define MEM_ROM *((uint8_t*) 0x08000000)
#define MEM_WRAM_BEGIN ((uint8_t*) 0x02000000)
#define MEM_WRAM_END ((uint8_t*) 0x0203FFFF)

60
src/nostalgia/core/gba/gfx.cpp
View File

@ -21,6 +21,8 @@ using namespace ox;
#define TILE_ADDR ((CharBlock*) 0x06000000)
#define TILE8_ADDR ((CharBlock8*) 0x06000000)
const auto GBA_TILE_COLUMNS = 32;
// map ASCII values to the nostalgia charset
static char charMap[128] = {
0,
@ -63,13 +65,13 @@ static char charMap[128] = {
0,
0,
0,
0,
0,
42, // (
43, // )
0,
0,
37, // ,
0,
0,
39, // .
0,
27, // 0
28, // 1
@ -81,10 +83,10 @@ static char charMap[128] = {
34, // 7
35, // 8
36, // 9
0,
0,
0,
0,
40, // :
0, // ;
0, // <
41, // =
0,
0,
0,
@ -114,6 +116,41 @@ static char charMap[128] = {
24, // X
25, // Y
26, // Z
44, // [
0, // backslash
45, // ]
0,
0,
0,
1, // a
2, // b
3, // c
4, // d
5, // e
6, // f
7, // g
8, // h
9, // i
10, // j
11, // k
12, // l
13, // m
14, // n
15, // o
16, // p
17, // q
18, // r
19, // s
20, // t
21, // u
22, // v
23, // w
24, // x
25, // y
26, // z
46, // {
0, // |
48, // }
};
ox::Error initGfx(Context *ctx) {
@ -127,7 +164,8 @@ ox::Error initGfx(Context *ctx) {
return 0;
}
ox::Error initConsole(Context *ctx) {
// Do NOT use Context in the GBA version of this function.
ox::Error initConsole(Context*) {
const auto CharsetInode = 101;
const auto PaletteStart = sizeof(GbaImageDataHeader);
ox::Error err = 0;
@ -160,13 +198,15 @@ ox::Error initConsole(Context *ctx) {
return err;
}
void puts(Context *ctx, int loc, const char *str) {
// Do NOT use Context in the GBA version of this function.
void puts(Context*, int loc, const char *str) {
for (int i = 0; str[i]; i++) {
MEM_BG_MAP[28][loc + i] = charMap[(int) str[i]];
}
}
void setTileMap(Context *ctx, int layer, int columns, int rows, uint16_t *buff) {
void setTile(Context *ctx, int layer, int column, int row, uint16_t tile) {
MEM_BG_MAP[28 + layer][row * GBA_TILE_COLUMNS + column] = tile;
}
}

70
src/nostalgia/core/gba/mem.cpp
View File

@ -7,14 +7,25 @@
*/
#include "addresses.hpp"
#include "panic.hpp"
namespace nostalgia {
namespace core {
static uint8_t *_heapPtr = MEM_WRAM_END;
struct HeapSegment {
size_t size;
uint8_t inUse;
HeapSegment *next;
};
void clearHeap() {
_heapPtr = MEM_WRAM_END;
static HeapSegment *_heapIdx = nullptr;
void initHeap() {
_heapIdx = (HeapSegment*) MEM_WRAM_END;
// set size to half of WRAM
_heapIdx->size = (MEM_WRAM_END - MEM_WRAM_BEGIN) / 2;
_heapIdx->next = nullptr;
_heapIdx->inUse = false;
}
}
@ -23,9 +34,60 @@ void clearHeap() {
using namespace nostalgia::core;
void *operator new(size_t sz) {
return _heapPtr -= sz;
// add space for heap segment header data
sz += sizeof(HeapSegment);
auto out = _heapIdx;
while (out && out->size < sz) {
out = out->next;
}
// panic if the allocation failed
if (out == nullptr) {
panic("Heap allocation failed");
}
// update size for the heap segment now that it is to be considered
// allocated
out->size = sz;
out->next = (HeapSegment*) (((uint8_t*) out) + sz);
out->inUse = true;
auto hs = *_heapIdx;
hs.size -= sz;
if (hs.size == 0) {
_heapIdx = hs.next;
} else {
_heapIdx = (HeapSegment*) (((uint8_t*) _heapIdx) - sz);
*_heapIdx = hs;
}
return out;
}
void operator delete(void *ptr) {
HeapSegment *prev = nullptr;
HeapSegment *current = _heapIdx;
while (current && current != ptr) {
prev = current;
current = current->next;
}
// ptr was found as a valid memory allocation, deallocate it
if (current) {
// mark as not in use
prev->inUse = false;
// join with next if next is also unused
if (current->next && !current->next->inUse) {
current->size += current->next->size;
current->next = current->next->next;
}
// join with prev if prev is also unused
if (prev && !prev->inUse) {
prev->size += current->size;
prev->next = current->next;
}
}
}

27
src/nostalgia/core/gba/panic.cpp Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright 2016-2017 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "../core.hpp"
#include "panic.hpp"
namespace nostalgia {
namespace core {
void panic(const char *msg) {
initConsole(nullptr);
puts(nullptr, 1 * 32 + 0, "SADNESS...");
puts(nullptr, 4 * 32 + 0, "UNEXPECTED STATE:");
puts(nullptr, 6 * 32 + 2, msg);
puts(nullptr, 10 * 32 + 0, "PLEASE RESTART THE SYSTEM");
// TODO: properly end program execution, this wastes power
while (1);
}
}
}

20
src/nostalgia/core/gba/panic.hpp Normal file
View File

@ -0,0 +1,20 @@
/*
* Copyright 2016-2017 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#pragma once
#include "panic.hpp"
namespace nostalgia {
namespace core {
void panic(const char *msg);
}
}

2
src/nostalgia/core/gfx.hpp
View File

@ -20,7 +20,7 @@ ox::Error initConsole(Context *ctx);
void puts(Context *ctx, int loc, const char *str);
void setTileMap(Context *ctx, int layer, int columns, int rows, uint16_t *buff);
void setTile(Context *ctx, int layer, int column, int row, uint16_t tile);
}
}

15
src/nostalgia/core/mem.hpp Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright 2016-2017 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace nostalgia {
namespace core {
void initHeap();
}
}

BIN
src/nostalgia/core/studio/charset.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

16
src/nostalgia/core/userland/mem.cpp Normal file
View File

@ -0,0 +1,16 @@
/*
* Copyright 2016-2017 gtalent2@gmail.com
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
namespace nostalgia {
namespace core {
void initHeap() {
}
}
}

26
src/nostalgia/world/world.cpp
View File

@ -11,5 +11,31 @@
namespace nostalgia {
namespace world {
Zone::Zone() {
m_bounds.x = -1;
m_bounds.y = -1;
m_bounds.width = -1;
m_bounds.height = -1;
}
void Zone::draw(core::Context *ctx) {
}
size_t Zone::size() {
return sizeof(Zone) + m_bounds.width * m_bounds.height * sizeof(TileDef);
}
TileDef *Zone::tiles() {
return (TileDef*) (this + 1);
}
TileDef *Zone::tile(int row, int column) {
return &tiles()[row * m_bounds.width + column];
}
void Zone::setTile(int row, int column, TileDef *td) {
tiles()[row * m_bounds.width + column] = *td;
}
}
}

51
src/nostalgia/world/world.hpp
View File

@ -10,13 +10,58 @@
#include <ox/std/types.hpp>
#include <nostalgia/common/common.hpp>
#include <nostalgia/core/core.hpp>
namespace nostalgia {
namespace world {
struct TileDef {
uint16_t bgTile;
};
template<typename T>
ox::Error ioOp(T *io, TileDef *obj) {
ox::Error err = 0;
io->setFields(1);
err |= io->op("bgTile", &obj->bgTile);
return err;
}
struct ZoneDef {
int width = 0;
int height = 0;
uint16_t tileMap;
int32_t width = 0;
int32_t height = 0;
};
class Zone {
private:
common::Bounds m_bounds;
public:
Zone();
void draw(core::Context *ctx);
size_t size();
TileDef *tiles();
TileDef *tile(int row, int column);
void setTile(int row, int column, TileDef *td);
};
class Region {
private:
Zone *m_zones;
public:
};
}