ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to higan v091r14 and ananke v00r03 releases. 

byuu says:

higan changelog:
- generates title displayed in emulator window by asking the core
- core builds title solely from "information/title" ... if it's not
  there, you don't get a title at all
- sub-system load menu is gone ... since there are multiple revisions of
  the SGB, this never really worked well anyway
- to load an SGB, BS-X or ST cartridge, load the base cartridge first
- "File->Load Game" moved to "Load->Import Game" ... may cause a bit of
  confusion to new users, but I don't like having a single-item menu,
  we'll just have to explain it to new users
- browser window redone to look like ananke
  - home button here goes to ~/Emulation rather than just ~ like ananke,
    since this is the home of game folders
  - game folder icon is now the executable icon for the Tango theme
    (orange diamond), meant to represent a complete game rather than
    a game file or archive

ananke changelog:
- outputs GBC games to "Game Boy Color/" instead of "Game Boy/"
- adds the file basename to "information/title"

Known issues:
- using ananke to load a GB game trips the Super Famicom SGB mode and
  fails (need to make the full-path auto-detection ignore non-bootable
  systems)
- need to dump and test some BS-X media before releasing
- ananke lacks BS-X Satellaview cartridge support
- v092 isn't going to let you retarget the ananke/higan game folder path
  of ~/Emulation, you will have to wait for a future version if that
  bothers you so greatly

[Later, after the v092 release, byuu posted this additional changelog:
    - kill laevateinn
    - add title()
    - add bootable, remove load
    - combine file, library
    - combine [][][] paths
    - fix SFC subtype handling XML->BML
    - update file browser to use buttons
    - update file browser keyboard handling
    - update system XML->BML
    - fix sufami turbo hashing
    - remove Cartridge::manifest
]
This commit is contained in:
Tim Allen 2012-12-25 16:31:55 +11:00
parent 85f2e9a6d4
commit d59ae34e12
124 changed files with 1345 additions and 7024 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ananke/ananke.cpp
View File

@ -11,6 +11,7 @@ using namespace phoenix;
namespace Database {
#include "database/super-famicom.hpp"
#include "database/sufami-turbo.hpp"
};
struct Ananke {
@ -42,6 +43,12 @@ struct Ananke {
void createSuperFamicomHeuristicFirmware(vector<uint8_t> &buffer, const string &pathname, bool firmware_appended);
string openSuperFamicom(vector<uint8_t> &buffer);
//sufami-turbo.cpp
void copySufamiTurboSaves(const string &pathname);
string createSufamiTurboDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest);
string createSufamiTurboHeuristic(vector<uint8_t> &buffer);
string openSufamiTurbo(vector<uint8_t> &buffer);
//game-boy.cpp
void copyGameBoySaves(const string &pathname);
string createGameBoyHeuristic(vector<uint8_t> &buffer);
@ -52,6 +59,7 @@ struct Ananke {
string createGameBoyAdvanceHeuristic(vector<uint8_t> &buffer);
string openGameBoyAdvance(vector<uint8_t> &buffer);
static bool supported(const string &filename);
string open(string filename = "");
};
@ -61,11 +69,29 @@ struct Ananke {
#include "patch.cpp"
#include "famicom.cpp"
#include "super-famicom.cpp"
#include "sufami-turbo.cpp"
#include "game-boy.cpp"
#include "game-boy-advance.cpp"
FileDialog *fileDialog = nullptr;
bool Ananke::supported(const string &filename) {
string extension = nall::extension(filename);
if(extension == "fc" ) return true;
if(extension == "nes") return true;
if(extension == "sfc") return true;
if(extension == "smc") return true;
if(extension == "bs" ) return true;
if(extension == "st" ) return true;
if(extension == "gb" ) return true;
if(extension == "gbc") return true;
if(extension == "gba") return true;
if(extension == "zip") return true;
return false;
}
string Ananke::open(string filename) {
if(filename.empty()) {
if(!fileDialog) fileDialog = new FileDialog;
@ -92,6 +118,7 @@ string Ananke::open(string filename) {
if(information.name.endswith(".fc") || information.name.endswith(".nes")) return openFamicom(buffer);
if(information.name.endswith(".sfc") || information.name.endswith(".smc")) return openSuperFamicom(buffer);
if(information.name.endswith(".st")) return openSufamiTurbo(buffer);
if(information.name.endswith(".gb") || information.name.endswith(".gbc")) return openGameBoy(buffer);
if(information.name.endswith(".gba")) return openGameBoyAdvance(buffer);
return "";

153
ananke/database/sufami-turbo.hpp Normal file
View File

@ -0,0 +1,153 @@
string SufamiTurbo = R"(
database revision=2012-12-24
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
information
title: SDウルトラバトル ウルトラマン伝説
name: SD Ultra Battle - Ultraman Densetsu
region: JP
revision: 1.0
serial: SFT-0101-JPN
sha256: 2bb55214fb668ca603d7b944b14f105dfb10b987a8902d420fe4ae1cb69c1d4a
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
information
title: SDウルトラバトル セブン伝説
name: SD Ultra Battle - Seven Densetsu
region: JP
revision: 1.0
serial: SFT-0102-JPN
sha256: 2fec5f2bc7dee010af10569a3d2bc18715a79a126940800c3eade5abbd625e3f
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
information
title: ポイポイ忍者ワールド
name: Poi Poi Ninja World
region: JP
revision: 1.0
serial: SFT-0103-JPN
sha256: 602b20b788640f5743487108a10f3f77bca5ce2d24208b25b1ca498a96eb0d69
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x800
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション 一年戦争機
name: SD Gundam Generation - Ichinen Sensouki
region: JP
revision: 1.0
serial: SFT-0104-JPN
sha256: 3e82215bed08274874b30d461fc4a965c6bca932229da5d46d56e36f484d65eb
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション グリプス戦記
name: SD Gundam Generation - Grips Senki
region: JP
revision: 1.0
serial: SFT-0105-JPN
sha256: 8547a08ed11fe408eac282a90ac46654bd2e5f49bda3aec8e5edf166a0a4b9af
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
information
title: ゲゲゲの鬼太郎 妖怪ドンジャン
name: Gegege no Kitarou - Youkai Dungeon
region: JP
revision: 1.0
serial: SFT-0106-JPN
sha256: d93b3a570e7cf343f680ab0768a50b77e3577f9c555007e2de3decd6bc4765c8
configuration
rom name=program.rom size=0x80000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション アクシズ戦記
name: SD Gundam Generation - Axis Senki
region: JP
revision: 1.0
serial: SFT-0107-JPN
sha256: 2a9d7c9a61318861028a73ca03e32a48cff162d76cba36fbaab8690b212efe9b
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション バビロニア建国戦記
name: SD Gundam Generation - Babylonia Kenkoku Senki
region: JP
revision: 1.0
serial: SFT-0108-JPN
sha256: 60ac017c18f534e8cf24ca7f38e22ce92db95ea6c30b2d59d76f13c4f1c8a6e4
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション ザンスカール戦記
name: SD Gundam Generation - Zanscar Senki
region: JP
revision: 1.0
serial: SFT-0110-JPN
sha256: 5951a58a91d8e397d0a237ccc2b1248e17c7312cb9cc11cbc350200a97b4e021
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
information
title: SDガンダムジェネレーション コロニア格闘記
name: SD Gundam Generation - Colonia Kakotouki
region: JP
revision: 1.0
serial: SFT-0111-JPN
sha256: e639b5d5d722432b6809ccc6801dc584e1a3016379f34b335ed2dfa73b1ebf69
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x2000
)";

96
ananke/database/super-famicom.hpp
View File

@ -1,6 +1,30 @@
string SuperFamicom = R"(
database revision=2012-12-18
database revision=2012-12-24
release
cartridge region=NTSC
board id:Sufami Turbo
rom name=program.rom size=0x40000
map id=rom address=00-1f,80-9f:8000-ffff mask=0x8000
sufamiturbo
slot id=A
map id=rom address=20-3f,a0-bf:8000-ffff mask=0x8000
map id=ram address=60-6f,e0-ef:0000-ffff
slot id=B
map id=rom address=40-5f,c0-df:0000-7fff mask=0x8000
map id=rom address=40-5f,c0-df:8000-ffff mask=0x8000
map id=ram address=70-7f,f0-ff:0000-ffff
information
title: スーファミターボ
name: Sufami Turbo
region: JP
revision: 1.0
board: Sufami Turbo
serial: SFT-0100-JPN
sha256: edacb453da14f825f05d1134d6035f4bf034e55f7cfb97c70c4ee107eabc7342
configuration
rom name=program.rom size=0x40000
release
cartridge region=NTSC
@ -2394,10 +2418,10 @@ release
release
cartridge region=NTSC
board type=1CA0N6S revision=01
superfx revision=2
superfx revision=4
rom name=program.rom size=0x80000
ram name=save.ram size=0x10000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000
map id=rom address=40-5f,c0-df:0000-ffff
map id=ram address=00-3f,80-bf:6000-7fff size=0x2000
@ -2413,6 +2437,7 @@ release
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x10000
superfx revision=4
release
cartridge region=NTSC
@ -2477,10 +2502,10 @@ release
release
cartridge region=NTSC
board type=1CB0N7S revision=01
superfx revision=3
superfx revision=4
rom name=program.rom size=0x200000
ram name=save.ram size=0x10000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-3f:8000-ffff mask=0x8000
map id=rom address=40-5f:0000-ffff
map id=ram address=00-3f,80-bf:6000-7fff size=0x2000
@ -2496,6 +2521,7 @@ release
configuration
rom name=program.rom size=0x200000
ram name=save.ram size=0x10000
superfx revision=4
release
cartridge region=NTSC
@ -5483,6 +5509,26 @@ release
rom name=program.rom size=0x100000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
board type=1J3M revision=01,11,20
rom name=program.rom size=0x180000
ram name=save.ram size=0x2000
map id=rom address=00-3f,80-bf:8000-ffff
map id=rom address=40-7f,c0-ff:0000-ffff
map id=ram address=20-3f,a0-bf:6000-7fff mask=0xe000
information
title: Madden NFL '96
name: Madden NFL '96
region: NA
revision: 1.0
board: SHVC-1J3M-20
serial: M/SNS-A6FE-USA
sha256: 3059d86cdc383985c564a7a891fe18e08f5222ead7ede9fa309159d60cde13a1
configuration
rom name=program.rom size=0x180000
ram name=save.ram size=0x2000
release
cartridge region=NTSC
board type=1J3M revision=01,11,20
@ -9366,7 +9412,7 @@ release
superfx revision=1
rom name=program.rom size=0x100000
ram name=save.ram size=0x8000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-1f,80-9f:8000-ffff mask=0x8000
map id=ram address=60-7f,e0-ff:0000-ffff
information
@ -9380,6 +9426,7 @@ release
configuration
rom name=program.rom size=0x100000
ram name=save.ram size=0x8000
superfx revision=1
release
cartridge region=NTSC
@ -9624,10 +9671,10 @@ release
release
cartridge region=NTSC
board type=1CA6B revision=01
superfx revision=2
superfx revision=4
rom name=program.rom size=0x100000
ram name=save.ram size=0x10000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000
map id=rom address=40-5f,c0-df:0000-ffff
map id=ram address=00-3f,80-bf:6000-7fff size=0x2000
@ -9643,6 +9690,7 @@ release
configuration
rom name=program.rom size=0x100000
ram name=save.ram size=0x10000
superfx revision=4
release
cartridge region=NTSC
@ -10106,6 +10154,28 @@ release
configuration
rom name=program.rom size=0x100000
release
cartridge region=NTSC
board id:Super Game Boy
rom name=program.rom size=0x40000
map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000
map id=rom address=40-7f,c0-ff:0000-7fff mask=0x8000
icd2 revision=1
rom name=sgb.boot.rom size=0x100
map id=io address=00-3f,80-bf:6000-67ff
map id=io address=00-3f,80-bf:7000-7fff
information
title: Super Game Boy
name: Super Game Boy
region: NA
revision: 1.2
board: Super Game Boy
serial: N/A
sha256: 4d7fc331a811b8dc630b469262fd6f45e289243cef83101f32038158967d1b28
configuration
rom name=program.rom size=0x40000
rom name=sgb.boot.rom size=0x100
release
cartridge region=NTSC
board type=1A0N revision=01,02,10,20,30
@ -10305,10 +10375,10 @@ release
release
cartridge region=NTSC
board type=1CB5B revision=20
superfx revision=3
superfx revision=4
rom name=program.rom size=0x200000
ram name=save.ram size=0x8000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-3f:8000-ffff mask=0x8000
map id=rom address=40-5f:0000-ffff
map id=ram address=00-3f,80-bf:6000-7fff size=0x2000
@ -10324,6 +10394,7 @@ release
configuration
rom name=program.rom size=0x200000
ram name=save.ram size=0x8000
superfx revision=4
release
cartridge region=NTSC
@ -11958,10 +12029,10 @@ release
release
cartridge region=NTSC
board type=1CA0N5S revision=01
superfx revision=2
superfx revision=4
rom name=program.rom size=0x80000
ram name=save.ram size=0x8000
map id=io address=00-3f,80-bf:3000-32ff
map id=io address=00-3f,80-bf:3000-34ff
map id=rom address=00-3f,80-bf:8000-ffff mask=0x8000
map id=rom address=40-5f,c0-df:0000-ffff
map id=ram address=00-3f,80-bf:6000-7fff size=0x2000
@ -11977,6 +12048,7 @@ release
configuration
rom name=program.rom size=0x80000
ram name=save.ram size=0x8000
superfx revision=4
release
cartridge region=NTSC

1
ananke/famicom.cpp
View File

@ -16,6 +16,7 @@ string Ananke::createFamicomHeuristic(vector<uint8_t> &buffer) {
FamicomCartridge info(buffer.data(), buffer.size());
string markup = info.markup();
markup.append("\ninformation\n title: ", nall::basename(information.name), "\n");
if(!information.manifest.empty()) markup = information.manifest; //override with embedded beat manifest, if one exists
file::write({pathname, "manifest.bml"}, markup);

24
ananke/file-dialog.cpp
View File

@ -6,7 +6,7 @@ struct FileDialog : Window {
Button upButton;
ListView fileList;
HorizontalLayout controlLayout;
Widget spacer;
Label filterLabel;
Button openButton;
string open() {
@ -14,11 +14,21 @@ struct FileDialog : Window {
setVisible();
fileList.setFocused();
filename = "";
bool backspace = false;
dialogActive = true;
while(dialogActive) {
OS::processEvents();
if(Keyboard::pressed(Keyboard::Scancode::Escape)) onClose();
if(Keyboard::pressed(Keyboard::Scancode::Backspace)) {
if(backspace == false) {
backspace = true;
if(fileList.focused()) upButton.onActivate();
}
} else {
backspace = false;
}
usleep(20 * 1000);
}
return filename;
@ -42,8 +52,13 @@ struct FileDialog : Window {
lstring files = directory::ifiles(pathname);
for(auto &file : files) {
if(Ananke::supported(file) == false) continue; //ignore unsupported extensions
fileList.append(file);
fileList.setImage(filenameList.size(), 0, {resource::file, sizeof resource::file});
if(extension(file) == "zip") {
fileList.setImage(filenameList.size(), 0, {resource::archive, sizeof resource::archive});
} else {
fileList.setImage(filenameList.size(), 0, {resource::file, sizeof resource::file});
}
filenameList.append({pathname, file});
}
@ -53,12 +68,13 @@ struct FileDialog : Window {
}
FileDialog() {
setGeometry({64, 64, 480, 600});
setFrameGeometry({64, 64, 480, 600});
setTitle("Load Image");
layout.setMargin(5);
homeButton.setImage({resource::home, sizeof resource::home});
upButton.setImage({resource::up, sizeof resource::up});
filterLabel.setText("Filter: *.fc, *.sfc, *.bs, *.st, *.gb, *.gbc, *.gba, *.nes, *.smc, *.zip");
openButton.setText("Open");
append(layout);
@ -68,7 +84,7 @@ struct FileDialog : Window {
pathLayout.append(upButton, {28, 28});
layout.append(fileList, {~0, ~0}, 5);
layout.append(controlLayout, {~0, 0});
controlLayout.append(spacer, {~0, 0});
controlLayout.append(filterLabel, {~0, 0}, 5);
controlLayout.append(openButton, {80, 0});
pathEdit.onActivate = [&] {

1
ananke/game-boy-advance.cpp
View File

@ -22,6 +22,7 @@ string Ananke::createGameBoyAdvanceHeuristic(vector<uint8_t> &buffer) {
GameBoyAdvanceCartridge info(buffer.data(), buffer.size());
string markup = info.markup;
markup.append("\ninformation\n title: ", nall::basename(information.name), "\n");
if(!information.manifest.empty()) markup = information.manifest; //override with embedded beat manifest, if one exists
file::write({pathname, "manifest.bml"}, markup);

5
ananke/game-boy.cpp
View File

@ -17,16 +17,17 @@ string Ananke::createGameBoyHeuristic(vector<uint8_t> &buffer) {
string pathname = {
userpath(),
"Emulation/Game Boy/",
"Emulation/Game Boy", (info.info.cgb ? " Color" : ""), "/",
nall::basename(information.name),
" (!).", (info.info.cgb ? "gbc" : "gb"), "/"
};
directory::create(pathname);
string markup = info.markup;
markup.append("\ninformation\n title: ", nall::basename(information.name), "\n");
if(!information.manifest.empty()) markup = information.manifest; //override with embedded beat manifest, if one exists
file::write({pathname, "manifest.bml"}, info.markup);
file::write({pathname, "manifest.bml"}, markup);
file::write({pathname, "program.rom"}, buffer);
copyGameBoySaves(pathname);

4
ananke/phoenix/core/core.cpp
View File

@ -674,6 +674,10 @@ bool Widget::enabled() {
return state.enabled;
}
bool Widget::focused() {
return p.focused();
}
string Widget::font() {
return state.font;
}

1
ananke/phoenix/core/core.hpp
View File

@ -333,6 +333,7 @@ struct Layout : private nall::base_from_member<pLayout&>, Sizable {
struct Widget : private nall::base_from_member<pWidget&>, Sizable {
bool enabled();
bool focused();
nall::string font();
Geometry geometry();
Geometry minimumGeometry();

4
ananke/phoenix/gtk/platform.hpp
View File

@ -231,6 +231,7 @@ struct pWidget : public pSizable {
GtkWidget *gtkWidget;
bool enabled();
virtual bool focused();
virtual Geometry minimumGeometry();
void setEnabled(bool enabled);
virtual void setFocused();
@ -310,6 +311,7 @@ struct pHexEdit : public pWidget {
GtkTextBuffer *textBuffer;
GtkTextMark *textCursor;
bool focused();
void setColumns(unsigned columns);
void setLength(unsigned length);
void setOffset(unsigned offset);
@ -396,6 +398,7 @@ struct pListView : public pWidget {
void append(const lstring &text);
void autoSizeColumns();
bool checked(unsigned row);
bool focused();
void modify(unsigned row, const lstring &text);
void remove(unsigned row);
void reset();
@ -449,6 +452,7 @@ struct pTextEdit : public pWidget {
GtkWidget *subWidget;
GtkTextBuffer *textBuffer;
bool focused();
void setCursorPosition(unsigned position);
void setEditable(bool editable);
void setText(const string &text);

4
ananke/phoenix/gtk/widget/hex-edit.cpp
View File

@ -7,6 +7,10 @@ static bool HexEdit_scroll(GtkRange *range, GtkScrollType scroll, gdouble value,
return false;
}
bool pHexEdit::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pHexEdit::setColumns(unsigned columns) {
setScroll();
update();

4
ananke/phoenix/gtk/widget/list-view.cpp
View File

@ -35,6 +35,10 @@ bool pListView::checked(unsigned row) {
return state;
}
bool pListView::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pListView::modify(unsigned row, const lstring &text) {
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(subWidget));
GtkTreeIter iter;

4
ananke/phoenix/gtk/widget/text-edit.cpp
View File

@ -3,6 +3,10 @@ static void TextEdit_change(TextEdit *self) {
if(self->p.locked == false && self->onChange) self->onChange();
}
bool pTextEdit::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pTextEdit::setCursorPosition(unsigned position) {
GtkTextMark *mark = gtk_text_buffer_get_mark(textBuffer, "insert");
GtkTextIter iter;

6
ananke/phoenix/gtk/widget/widget.cpp
View File

@ -1,11 +1,15 @@
Geometry pWidget::minimumGeometry() {
return { 0, 0, 0, 0 };
return {0, 0, 0, 0};
}
bool pWidget::enabled() {
return gtk_widget_get_sensitive(gtkWidget);
}
bool pWidget::focused() {
return GTK_WIDGET_HAS_FOCUS(gtkWidget);
}
void pWidget::setEnabled(bool enabled) {
if(widget.state.abstract) enabled = false;
if(sizable.state.layout && sizable.state.layout->enabled() == false) enabled = false;

1
ananke/phoenix/gtk/window.cpp
View File

@ -30,6 +30,7 @@ static gboolean Window_expose(GtkWidget *widget, GdkEvent *event, Window *window
static gboolean Window_configure(GtkWidget *widget, GdkEvent *event, Window *window) {
if(gtk_widget_get_realized(window->p.widget) == false) return false;
if(window->visible() == false) return false;
GdkWindow *gdkWindow = gtk_widget_get_window(widget);
GdkRectangle border, client;

2
ananke/phoenix/qt/platform.moc
View File

@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'platform.moc.hpp'
**
** Created: Thu Aug 9 18:10:14 2012
** Created: Fri Dec 21 16:30:24 2012
** by: The Qt Meta Object Compiler version 62 (Qt 4.6.3)
**
** WARNING! All changes made in this file will be lost!

BIN
ananke/resource/archive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
ananke/resource/resource.bml
View File

@ -3,3 +3,4 @@ resource name=resource
binary id=up name=up.png
binary id=folder name=folder.png
binary id=file name=file.png
binary id=archive name=archive.png

37
ananke/resource/resource.cpp
View File

@ -116,4 +116,41 @@ const uint8_t file[844] = {
0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t archive[1067] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,3,226,73,68,65,84,88,133,237,150,95,136,212,
85,20,199,63,231,222,251,251,253,102,102,103,255,142,166,27,150,150,88,144,102,127,31,218,40,49,200,36,136,68,200,30,
20,218,212,13,89,84,8,138,30,138,222,10,122,232,205,212,44,89,55,145,192,146,32,168,232,37,42,208,212,84,212,165,
32,162,168,101,21,203,221,213,253,51,237,56,51,191,223,189,61,252,134,217,217,117,86,155,26,240,161,253,194,225,222,115,
239,253,157,251,189,231,158,223,57,23,102,49,139,255,59,228,90,147,189,47,164,151,26,63,120,51,12,243,107,156,184,60,
14,59,229,75,135,2,130,234,70,5,45,114,196,89,121,233,185,247,198,142,215,68,96,223,150,166,37,126,144,58,168,148,
190,115,249,163,107,82,205,109,237,68,81,136,32,24,63,0,229,163,76,2,209,1,202,76,138,232,4,202,11,80,58,32,
180,206,253,240,117,143,244,159,250,232,47,27,113,209,138,125,165,115,87,246,208,117,9,236,239,106,190,77,18,254,137,101,
43,58,91,231,45,186,67,141,12,156,117,103,15,127,38,78,0,231,112,81,30,163,4,163,193,211,130,209,130,167,193,76,
235,39,146,45,100,30,123,195,93,56,190,215,133,131,167,213,207,231,70,115,69,203,182,141,239,142,247,84,238,167,43,149,
3,93,201,5,36,147,199,239,93,221,221,182,248,129,213,122,252,66,31,167,191,249,88,10,133,43,216,40,196,218,8,37,
160,68,80,10,180,18,148,18,180,2,53,173,47,46,79,225,242,79,114,83,199,139,146,255,227,20,173,137,208,27,30,203,
175,122,250,65,51,240,233,201,98,223,85,30,120,191,171,97,94,50,149,60,185,108,229,166,246,246,37,29,218,141,253,138,
23,52,80,140,38,157,100,157,5,107,65,25,68,123,177,168,88,40,181,162,13,136,46,27,78,54,207,167,144,27,167,175,
119,45,162,52,191,93,24,155,112,214,110,234,220,147,61,88,38,208,179,49,61,55,104,76,29,107,91,176,116,161,56,114,
67,3,125,233,71,158,121,141,230,185,183,146,27,57,55,121,95,162,64,52,136,138,5,13,74,226,13,69,202,115,18,7,
40,0,65,67,134,200,193,151,59,214,227,108,33,151,12,252,68,54,151,15,113,172,239,220,147,61,36,123,55,55,181,25,
99,135,1,252,32,117,62,44,230,191,187,253,190,39,215,221,179,122,27,209,200,47,224,44,206,89,112,46,182,234,92,172,
151,250,255,100,204,207,220,69,118,228,34,95,125,240,242,69,92,120,38,178,246,9,0,177,108,85,198,68,111,3,160,100,
205,149,98,126,69,208,152,121,106,249,170,173,68,163,191,99,139,19,216,98,14,23,94,41,139,13,167,233,197,220,117,199,
242,127,158,165,113,206,34,238,94,185,161,69,180,30,182,74,47,22,56,234,20,59,167,252,5,7,182,207,57,252,248,230,
221,15,167,51,11,175,153,31,254,11,190,221,191,61,55,116,254,199,141,157,187,42,98,0,96,95,119,211,67,98,237,81,
165,117,81,68,121,162,52,206,70,53,152,118,51,206,136,196,182,28,46,111,163,40,0,120,126,79,86,166,16,112,32,31,
118,55,183,0,20,109,116,169,99,237,171,12,28,235,169,110,177,70,220,124,255,58,190,255,124,7,158,210,109,0,158,248,
197,103,119,13,102,1,76,153,37,56,118,143,94,6,232,221,146,38,145,74,147,76,165,235,66,32,72,54,2,176,161,100,
191,18,230,170,213,37,40,109,240,147,13,117,33,160,141,55,227,220,140,4,180,241,240,19,245,241,128,54,126,237,4,140,
246,8,18,245,241,128,249,247,30,184,145,4,60,143,160,78,49,96,252,242,21,248,64,225,90,4,2,160,21,226,138,103,
252,20,184,90,114,65,21,136,66,169,114,209,189,5,24,3,46,1,81,53,2,205,64,198,41,111,112,184,255,204,220,204,
194,142,210,112,69,146,113,149,9,199,149,117,87,117,77,220,14,245,247,97,197,27,2,230,151,246,140,74,36,166,16,208,
37,221,251,226,244,196,91,216,157,175,11,97,75,141,231,173,10,135,25,249,228,196,196,59,64,2,240,168,120,135,76,207,
249,173,64,166,212,6,196,119,86,15,20,0,5,100,137,79,126,30,40,86,35,0,144,4,90,74,155,207,24,164,53,34,
36,190,143,81,96,28,38,31,183,215,171,122,245,170,138,51,87,170,89,220,104,252,13,162,179,143,166,193,167,182,66,0,
0,0,0,73,69,78,68,174,66,96,130,
};
};

1
ananke/resource/resource.hpp
View File

@ -3,4 +3,5 @@ namespace resource {
extern const uint8_t up[652];
extern const uint8_t folder[1176];
extern const uint8_t file[844];
extern const uint8_t archive[1067];
};

71
ananke/sufami-turbo.cpp Normal file
View File

@ -0,0 +1,71 @@
void Ananke::copySufamiTurboSaves(const string &pathname) {
if(!file::exists({pathname, "save.ram"})) {
if(file::exists({information.path, nall::basename(information.name), ".srm"})) {
file::copy({information.path, nall::basename(information.name), ".srm"}, {pathname, "save.ram"});
}
}
}
string Ananke::createSufamiTurboDatabase(vector<uint8_t> &buffer, Markup::Node &document, const string &manifest) {
string pathname = {
userpath(), "Emulation/Sufami Turbo/",
document["release/information/name"].text(),
" (", document["release/information/region"].text(), ")",
" (", document["release/information/revision"].text(), ")",
".st/"
};
directory::create(pathname);
//strip "release" root node from database entry (since a single game manifest isn't part of a database)
string markup = manifest;
markup.replace("\n ", "\n");
markup.replace("information", "\ninformation");
markup.ltrim<1>("release\n");
file::write({pathname, "manifest.bml"}, markup);
file::write({pathname, "program.rom"}, buffer);
copySufamiTurboSaves(pathname);
return "";
}
string Ananke::createSufamiTurboHeuristic(vector<uint8_t> &buffer) {
string pathname = {
userpath(), "Emulation/Sufami Turbo/",
nall::basename(information.name),
" (!).st/"
};
directory::create(pathname);
file::write({pathname, "manifest.bml"}, {
"cartridge\n",
" rom name=program.rom size=0x", hex(buffer.size()), "\n",
" ram name=save.ram size=0x2000\n"
"\n"
"information\n"
" title: ", nall::basename(information.name), "\n"
});
file::write({pathname, "program.rom"}, buffer);
copySufamiTurboSaves(pathname);
return "";
}
string Ananke::openSufamiTurbo(vector<uint8_t> &buffer) {
string sha256 = nall::sha256(buffer.data(), buffer.size());
string databaseText = string::read({configpath(), "ananke/database/Sufami Turbo.bml"}).strip();
if(databaseText.empty()) databaseText = string{Database::SufamiTurbo}.strip();
lstring databaseItem = databaseText.split("\n\n");
for(auto &item : databaseItem) {
item.append("\n");
auto document = Markup::Document(item);
if(document["release/information/sha256"].text() == sha256) {
return createSufamiTurboDatabase(buffer, document, item);
}
}
return createSufamiTurboHeuristic(buffer);
}

3
ananke/super-famicom.cpp
View File

@ -55,6 +55,7 @@ string Ananke::createSuperFamicomHeuristic(vector<uint8_t> &buffer) {
SuperFamicomCartridge info(buffer.data(), buffer.size());
string markup = info.markup;
markup.append("\ninformation\n title: ", nall::basename(information.name), "\n");
if(!information.manifest.empty()) markup = information.manifest; //override with embedded beat manifest, if one exists
information.manifest = markup; //save for use with firmware routine below
@ -121,7 +122,7 @@ void Ananke::createSuperFamicomHeuristicFirmware(vector<uint8_t> &buffer, const
string Ananke::openSuperFamicom(vector<uint8_t> &buffer) {
string sha256 = nall::sha256(buffer.data(), buffer.size());
string databaseText = string::read({configpath(), "ananke/database/Super Famicom.bml"}).rtrim("\n");
string databaseText = string::read({configpath(), "ananke/database/Super Famicom.bml"}).strip();
if(databaseText.empty()) databaseText = string{Database::SuperFamicom}.strip();
lstring databaseItem = databaseText.split("\n\n");

3812
higan/data/laevateinn.hpp
View File

File diff suppressed because it is too large Load Diff

2
higan/emulator/emulator.hpp
View File

@ -3,7 +3,7 @@
namespace Emulator {
static const char Name[] = "higan";
static const char Version[] = "091.13";
static const char Version[] = "091.14";
static const char Author[] = "byuu";
static const char License[] = "GPLv3";
}

3
higan/emulator/interface.hpp
View File

@ -21,7 +21,7 @@ struct Interface {
unsigned id;
string name;
string type;
string load;
bool bootable; //false for slotted sub-cartridges (Super Game Boy et al)
};
vector<Media> media;
@ -75,6 +75,7 @@ struct Interface {
template<typename... Args> void notify(Args&... args) { return bind->notify({std::forward<Args>(args)...}); }
//information
virtual string title() { return ""; }
virtual double videoFrequency() = 0;
virtual double audioFrequency() = 0;

7
higan/fc/cartridge/board/board.cpp
View File

@ -86,8 +86,8 @@ Board::Board(Markup::Node &document) {
cartridge.board = this;
auto cartridge = document["cartridge"];
information.type = cartridge["board"]["type"].data;
information.battery = cartridge["prg"]["ram"]["nonvolatile"].data == "true";
information.type = cartridge["board/type"].data;
information.battery = cartridge["prg/ram/nonvolatile"].exists();
auto prom = cartridge["prg"]["rom"];
auto pram = cartridge["prg"]["ram"];
@ -121,7 +121,8 @@ Board::~Board() {
Board* Board::load(const string &manifest) {
auto document = Markup::Document(manifest);
string type = document["cartridge"]["board"]["type"].data;
cartridge.information.title = document["information/title"].text();
string type = document["cartridge/board/type"].text();
if(type == "BANDAI-FCG" ) return new BandaiFCG(document);

4
higan/fc/cartridge/cartridge.cpp
View File

@ -6,6 +6,10 @@ namespace Famicom {
#include "board/board.cpp"
Cartridge cartridge;
string Cartridge::title() {
return information.title;
}
void Cartridge::Main() {
cartridge.main();
}

3
higan/fc/cartridge/cartridge.hpp
View File

@ -16,8 +16,11 @@ struct Cartridge : Thread, property<Cartridge> {
struct Information {
string markup;
string title;
} information;
string title();
struct Memory {
unsigned id;
string name;

6
higan/fc/interface/interface.cpp
View File

@ -4,6 +4,10 @@ namespace Famicom {
Interface *interface = nullptr;
string Interface::title() {
return cartridge.title();
}
double Interface::videoFrequency() {
return 21477272.0 / (262.0 * 1364.0 - 4.0);
}
@ -124,7 +128,7 @@ Interface::Interface() {
information.capability.states = true;
information.capability.cheats = true;
media.append({ID::Famicom, "Famicom", "fc"});
media.append({ID::Famicom, "Famicom", "fc", true});
{
Device device{0, ID::Port1 | ID::Port2, "Controller"};

1
higan/fc/interface/interface.hpp
View File

@ -22,6 +22,7 @@ struct ID {
};
struct Interface : Emulator::Interface {
string title();
double videoFrequency();
double audioFrequency();

7
higan/gb/cartridge/cartridge.cpp
View File

@ -14,6 +14,10 @@ namespace GameBoy {
#include "serialization.cpp"
Cartridge cartridge;
string Cartridge::title() {
return information.title;
}
void Cartridge::load(System::Revision revision, const string &manifest) {
information.markup = manifest;
information.mapper = Mapper::Unknown;
@ -26,8 +30,9 @@ void Cartridge::load(System::Revision revision, const string &manifest) {
information.ramsize = 0;
auto document = Markup::Document(manifest);
information.title = document["information/title"].text();
auto mapperid = document["cartridge"]["board"]["type"].data;
auto mapperid = document["cartridge/board/type"].text();
if(mapperid == "none" ) information.mapper = Mapper::MBC0;
if(mapperid == "MBC1" ) information.mapper = Mapper::MBC1;
if(mapperid == "MBC2" ) information.mapper = Mapper::MBC2;

3
higan/gb/cartridge/cartridge.hpp
View File

@ -22,6 +22,7 @@ struct Cartridge : MMIO, property<Cartridge> {
struct Information {
string markup;
string title;
Mapper mapper;
bool ram;
@ -33,6 +34,8 @@ struct Cartridge : MMIO, property<Cartridge> {
unsigned ramsize;
} information;
string title();
struct Memory {
unsigned id;
string name;

8
higan/gb/interface/interface.cpp
View File

@ -12,6 +12,10 @@ void Interface::joypWrite(bool p15, bool p14) {
if(hook) hook->joypWrite(p15, p14);
}
string Interface::title() {
return cartridge.title();
}
double Interface::videoFrequency() {
return 4194304.0 / (154.0 * 456.0);
}
@ -140,8 +144,8 @@ Interface::Interface() {
information.capability.states = true;
information.capability.cheats = true;
media.append({ID::GameBoy, "Game Boy", "gb" });
media.append({ID::GameBoyColor, "Game Boy Color", "gbc"});
media.append({ID::GameBoy, "Game Boy", "gb" , true});
media.append({ID::GameBoyColor, "Game Boy Color", "gbc", true});
{
Device device{0, ID::Device, "Controller"};

1
higan/gb/interface/interface.hpp
View File

@ -35,6 +35,7 @@ struct Interface : Emulator::Interface {
void lcdScanline();
void joypWrite(bool p15, bool p14);
string title();
double videoFrequency();
double audioFrequency();

13
higan/gba/cartridge/cartridge.cpp
View File

@ -7,13 +7,18 @@ namespace GameBoyAdvance {
#include "serialization.cpp"
Cartridge cartridge;
string Cartridge::title() {
return information.title;
}
void Cartridge::load(const string &manifest) {
information.markup = manifest;
auto document = Markup::Document(manifest);
information.title = document["information/title"].text();
unsigned rom_size = 0;
if(document["cartridge"]["rom"].exists()) {
auto info = document["cartridge"]["rom"];
if(document["cartridge/rom"].exists()) {
auto info = document["cartridge/rom"];
interface->loadRequest(ID::ROM, info["name"].data);
rom_size = numeral(info["size"].data);
for(unsigned addr = rom_size; addr < rom.size; addr++) {
@ -25,8 +30,8 @@ void Cartridge::load(const string &manifest) {
has_eeprom = false;
has_flashrom = false;
if(document["cartridge"]["ram"].exists()) {
auto info = document["cartridge"]["ram"];
if(document["cartridge/ram"].exists()) {
auto info = document["cartridge/ram"];
if(info["type"].data == "SRAM" || info["type"].data == "FRAM") {
has_sram = true;

3
higan/gba/cartridge/cartridge.hpp
View File

@ -10,8 +10,11 @@ struct Cartridge : property<Cartridge> {
struct Information {
string markup;
string title;
} information;
string title();
struct Media {
unsigned id;
string name;

6
higan/gba/interface/interface.cpp
View File

@ -4,6 +4,10 @@ namespace GameBoyAdvance {
Interface *interface = nullptr;
string Interface::title() {
return cartridge.title();
}
double Interface::videoFrequency() {
return 16777216.0 / (228.0 * 1232.0);
}
@ -118,7 +122,7 @@ Interface::Interface() {
information.capability.states = true;
information.capability.cheats = false;
media.append({ID::GameBoyAdvance, "Game Boy Advance", "gba"});
media.append({ID::GameBoyAdvance, "Game Boy Advance", "gba", true});
{
Device device{0, ID::Device, "Controller"};

1
higan/gba/interface/interface.hpp
View File

@ -22,6 +22,7 @@ struct ID {
};
struct Interface : Emulator::Interface {
string title();
double videoFrequency();
double audioFrequency();

76
higan/nall/directory.hpp
View File

@ -21,9 +21,53 @@ struct directory {
static bool create(const string &pathname, unsigned permissions = 0755); //recursive
static bool remove(const string &pathname); //recursive
static bool exists(const string &pathname);
static lstring folders(const string &pathname, const string &pattern = "*");
static lstring files(const string &pathname, const string &pattern = "*");
static lstring contents(const string &pathname, const string &pattern = "*");
static lstring folders(const string &pathname, const string &pattern = "*") {
lstring folders = directory::ufolders(pathname, pattern);
folders.sort();
return folders;
}
static lstring files(const string &pathname, const string &pattern = "*") {
lstring files = directory::ufiles(pathname, pattern);
files.sort();
return files;
}
static lstring contents(const string &pathname, const string &pattern = "*") {
lstring folders = directory::ufolders(pathname); //pattern search of contents should only filter files
lstring files = directory::ufiles(pathname, pattern);
folders.sort();
files.sort();
for(auto &file : files) folders.append(file);
return folders;
}
static lstring ifolders(const string &pathname, const string &pattern = "*") {
lstring folders = ufolders(pathname, pattern);
folders.isort();
return folders;
}
static lstring ifiles(const string &pathname, const string &pattern = "*") {
lstring files = ufiles(pathname, pattern);
files.isort();
return files;
}
static lstring icontents(const string &pathname, const string &pattern = "*") {
lstring folders = directory::ufolders(pathname); //pattern search of contents should only filter files
lstring files = directory::ufiles(pathname, pattern);
folders.isort();
files.isort();
for(auto &file : files) folders.append(file);
return folders;
}
private:
//internal functions; these return unsorted lists
static lstring ufolders(const string &pathname, const string &pattern = "*");
static lstring ufiles(const string &pathname, const string &pattern = "*");
};
#if defined(PLATFORM_WINDOWS)
@ -55,7 +99,7 @@ struct directory {
return (result & FILE_ATTRIBUTE_DIRECTORY);
}
inline lstring directory::folders(const string &pathname, const string &pattern) {
inline lstring directory::ufolders(const string &pathname, const string &pattern) {
lstring list;
string path = pathname;
path.transform("/", "\\");
@ -81,12 +125,11 @@ struct directory {
}
FindClose(handle);
}
if(list.size() > 0) list.sort();
for(auto &name : list) name.append("/"); //must append after sorting
return list;
}
inline lstring directory::files(const string &pathname, const string &pattern) {
inline lstring directory::ufiles(const string &pathname, const string &pattern) {
lstring list;
string path = pathname;
path.transform("/", "\\");
@ -108,16 +151,8 @@ struct directory {
}
FindClose(handle);
}
if(list.size() > 0) list.sort();
return list;
}
inline lstring directory::contents(const string &pathname, const string &pattern) {
lstring folders = directory::folders(pathname); //pattern search of contents() should only filter files
lstring files = directory::files(pathname, pattern);
for(auto &file : files) folders.append(file);
return folders;
}
#else
inline bool directory::create(const string &pathname, unsigned permissions) {
string path;
@ -146,7 +181,7 @@ struct directory {
return true;
}
inline lstring directory::folders(const string &pathname, const string &pattern) {
inline lstring directory::ufolders(const string &pathname, const string &pattern) {
lstring list;
DIR *dp;
struct dirent *ep;
@ -161,12 +196,11 @@ struct directory {
}
closedir(dp);
}
if(list.size() > 0) list.sort();
for(auto &name : list) name.append("/"); //must append after sorting
return list;
}
inline lstring directory::files(const string &pathname, const string &pattern) {
inline lstring directory::ufiles(const string &pathname, const string &pattern) {
lstring list;
DIR *dp;
struct dirent *ep;
@ -181,16 +215,8 @@ struct directory {
}
closedir(dp);
}
if(list.size() > 0) list.sort();
return list;
}
inline lstring directory::contents(const string &pathname, const string &pattern) {
lstring folders = directory::folders(pathname); //pattern search of contents() should only filter files
lstring files = directory::files(pathname, pattern);
for(auto &file : files) folders.append(file);
return folders;
}
#endif
}

111
higan/nall/emulation/famicom.hpp
View File

@ -27,8 +27,6 @@ FamicomCartridge::FamicomCartridge(const uint8_t *data, unsigned size) {
if(data[2] != 'S') return;
if(data[3] != 26) return;
markup.append("<?xml version='1.0' encoding='UTF-8'?>\n");
mapper = ((data[7] >> 4) << 4) | (data[6] >> 4);
mirror = ((data[6] & 0x08) >> 2) | (data[6] & 0x01);
prgrom = data[4] * 0x4000;
@ -36,145 +34,138 @@ FamicomCartridge::FamicomCartridge(const uint8_t *data, unsigned size) {
prgram = 0u;
chrram = chrrom == 0u ? 8192u : 0u;
markup.append("<cartridge sha256='", sha256(data, size), "'>\n");
markup.append("cartridge\n");
switch(mapper) {
default:
markup.append(" <board type='NES-NROM-256'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=NES-NROM-256\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
break;
case 1:
markup.append(" <board type='NES-SXROM'/>\n");
markup.append(" <chip type='MMC1B2'/>\n");
markup.append(" board type=NES-SXROM\n");
markup.append(" chip type=MMC1B2\n");
prgram = 8192;
break;
case 2:
markup.append(" <board type='NES-UOROM'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=NES-UOROM\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
break;
case 3:
markup.append(" <board type='NES-CNROM'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=NES-CNROM\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
break;
case 4:
//MMC3
markup.append(" <board type='NES-TLROM'/>\n");
markup.append(" <chip type='MMC3B'/>\n");
markup.append(" board type=NES-TLROM\n");
markup.append(" chip type=MMC3B\n");
prgram = 8192;
//MMC6
//markup.append(" <board type='NES-HKROM'/>\n");
//markup.append(" <chip type='MMC6'/>\n");
//markup.append(" board type=NES-HKROM\n");
//markup.append(" chip type=MMC6n");
//prgram = 1024;
break;
case 5:
markup.append(" <board type='NES-ELROM'/>\n");
markup.append(" <chip type='MMC5'/>\n");
markup.append(" board type=NES-ELROM\n");
markup.append(" chip type=MMC5\n");
prgram = 65536;
break;
case 7:
markup.append(" <board type='NES-AOROM'/>\n");
markup.append(" board type=NES-AOROM\n");
break;
case 9:
markup.append(" <board type='NES-PNROM'/>\n");
markup.append(" <chip type='MMC2'/>\n");
markup.append(" board type=NES-PNROM\n");
markup.append(" chip type=MMC2\n");
prgram = 8192;
break;
case 10:
markup.append(" <board type='NES-FKROM'/>\n");
markup.append(" <chip type='MMC4'/>\n");
markup.append(" board type=NES-FKROM\n");
markup.append(" chip type=MMC4\n");
prgram = 8192;
break;
case 16:
markup.append(" <board type='BANDAI-FCG'/>\n");
markup.append(" <chip type='LZ93D50'/>\n");
markup.append(" board type=BANDAI-FCG\n");
markup.append(" chip type=LZ93D50\n");
break;
case 21:
case 23:
case 25:
//VRC4
markup.append(" <board type='KONAMI-VRC-4'/>\n");
markup.append(" <chip type='VRC4'>\n");
markup.append(" <pinout a0='1' a1='0'/>\n");
markup.append(" </chip>\n");
markup.append(" board type=KONAMI-VRC-4\n");
markup.append(" chip type=VRC4\n");
markup.append(" pinout a0=1 a1=0\n");
prgram = 8192;
break;
case 22:
//VRC2
markup.append(" <board type='KONAMI-VRC-2'/>\n");
markup.append(" <chip type='VRC2'>\n");
markup.append(" <pinout a0='0' a1='1'/>\n");
markup.append(" </chip>\n");
markup.append(" board type=KONAMI-VRC-2\n");
markup.append(" chip type=VRC2\n");
markup.append(" pinout a0=0 a1=1\n");
break;
case 24:
markup.append(" <board type='KONAMI-VRC-6'/>\n");
markup.append(" <chip type='VRC6'/>\n");
markup.append(" board type=KONAMI-VRC-6\n");
markup.append(" chip type=VRC6\n");
break;
case 26:
markup.append(" <board type='KONAMI-VRC-6'/>\n");
markup.append(" <chip type='VRC6'/>\n");
markup.append(" board type=KONAMI-VRC-6\n");
markup.append(" chip type=VRC6\n");
prgram = 8192;
break;
case 34:
markup.append(" <board type='NES-BNROM'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=NES-BNROM\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
break;
case 66:
markup.append(" <board type='NES-GNROM'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=NES-GNROM\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
break;
case 69:
markup.append(" <board type='SUNSOFT-5B'/>\n");
markup.append(" <chip type='5B'/>\n");
markup.append(" board type=SUNSOFT-5B\n");
markup.append(" chip type=5B\n");
prgram = 8192;
break;
case 73:
markup.append(" <board type='KONAMI-VRC-3'/>\n");
markup.append(" <chip type='VRC3'/>\n");
markup.append(" <mirror mode='", mirror == 0 ? "horizontal" : "vertical", "'/>\n");
markup.append(" board type=KONAMI-VRC-3\n");
markup.append(" chip type=VRC3\n");
markup.append(" mirror mode=", mirror == 0 ? "horizontal" : "vertical", "\n");
prgram = 8192;
break;
case 75:
markup.append(" <board type='KONAMI-VRC-1'/>\n");
markup.append(" <chip type='VRC1'/>\n");
markup.append(" board type=KONAMI-VRC-1\n");
markup.append(" chip type=VRC1\n");
break;
case 85:
markup.append(" <board type='KONAMI-VRC-7/'>\n");
markup.append(" <chip type='VRC7'/>\n");
markup.append(" board type=KONAMI-VRC-7\n");
markup.append(" chip type=VRC7\n");
prgram = 8192;
break;
}
markup.append(" <prg>\n");
if(prgrom) markup.append(" <rom name='program.rom' size='0x", hex(prgrom), "'/>\n");
if(prgram) markup.append(" <ram name='save.ram' size='0x", hex(prgram), "'/>\n");
markup.append(" </prg>\n");
markup.append(" prg\n");
if(prgrom) markup.append(" rom name=program.rom size=0x", hex(prgrom), "\n");
if(prgram) markup.append(" ram name=save.ram size=0x", hex(prgram), "\n");
markup.append(" <chr>\n");
if(chrrom) markup.append(" <rom name='character.rom' size='0x", hex(chrrom), "'/>\n");
if(chrram) markup.append(" <ram size='0x", hex(chrram), "'/>\n");
markup.append(" </chr>\n");
markup.append("</cartridge>\n");
markup.transform("'", "\"");
markup.append(" chr\n");
if(chrrom) markup.append(" rom name=character.rom size=0x", hex(chrrom), "\n");
if(chrram) markup.append(" ram size=0x", hex(chrram), "\n");
}
}

23
higan/nall/emulation/game-boy-advance.hpp
View File

@ -46,21 +46,16 @@ GameBoyAdvanceCartridge::GameBoyAdvanceCartridge(const uint8_t *data, unsigned s
identifiers = list.concatenate(",");
markup = "";
markup.append("<?xml version='1.0' encoding='UTF-8'?>\n");
markup.append("<cartridge sha256='", sha256(data, size), "'>\n");
markup.append(" <rom name='program.rom' size='0x", hex(size), "'/>\n");
markup.append("cartridge\n");
markup.append(" rom name=program.rom size=0x", hex(size), "\n");
if(0);
else if(identifiers.beginswith("SRAM_V" )) markup.append(" <ram name='save.ram' type='SRAM' size='0x8000'/>\n");
else if(identifiers.beginswith("SRAM_F_V" )) markup.append(" <ram name='save.ram' type='FRAM' size='0x8000'/>\n");
else if(identifiers.beginswith("EEPROM_V" )) markup.append(" <ram name='save.ram' type='EEPROM' size='0x0'/>\n");
else if(identifiers.beginswith("FLASH_V" )) markup.append(" <ram name='save.ram' type='FlashROM' size='0x10000'/>\n");
else if(identifiers.beginswith("FLASH512_V")) markup.append(" <ram name='save.ram' type='FlashROM' size='0x10000'/>\n");
else if(identifiers.beginswith("FLASH1M_V" )) markup.append(" <ram name='save.ram' type='FlashROM' size='0x20000'/>\n");
if(identifiers.empty() == false) markup.append(" <!-- detected: ", identifiers, " -->\n");
markup.append("</cartridge>\n");
markup.transform("'", "\"");
else if(identifiers.beginswith("SRAM_V" )) markup.append(" ram name=save.ram type=SRAM size=0x8000\n");
else if(identifiers.beginswith("SRAM_F_V" )) markup.append(" ram name=save.ram type=FRAM size=0x8000\n");
else if(identifiers.beginswith("EEPROM_V" )) markup.append(" ram name=save.ram type=EEPROM size=0x0\n");
else if(identifiers.beginswith("FLASH_V" )) markup.append(" ram name=save.ram type=FlashROM size=0x10000\n");
else if(identifiers.beginswith("FLASH512_V")) markup.append(" ram name=save.ram type=FlashROM size=0x10000\n");
else if(identifiers.beginswith("FLASH1M_V" )) markup.append(" ram name=save.ram type=FlashROM size=0x20000\n");
//if(identifiers.empty() == false) markup.append(" #detected: ", identifiers, "\n");
}
}

12
higan/nall/emulation/game-boy.hpp
View File

@ -108,13 +108,11 @@ GameBoyCartridge::GameBoyCartridge(uint8_t *romdata, unsigned romsize) {
if(info.mapper == "MBC2") info.ramsize = 512; //512 x 4-bit
markup = "<?xml version='1.0' encoding='UTF-8'?>\n";
markup.append("<cartridge>\n");
markup.append(" <board type='", info.mapper, "'/>\n");
markup.append(" <rom name='program.rom' size='0x", hex(romsize), "'/>\n");
if(info.ramsize > 0) markup.append(" <ram name='save.ram' size='0x", hex(info.ramsize), "'/>\n");
markup.append("</cartridge>\n");
markup.transform("'", "\"");
markup = "";
markup.append("cartridge\n");
markup.append(" board type=", info.mapper, "\n");
markup.append(" rom name=program.rom size=0x", hex(romsize), "\n");
if(info.ramsize > 0) markup.append(" ram name=save.ram size=0x", hex(info.ramsize), "\n");
}
}

332
higan/nall/emulation/super-famicom.hpp
View File

@ -76,10 +76,11 @@ struct SuperFamicomCartridge {
DSP1HiROM,
};
bool loaded; //is a base cartridge inserted?
unsigned crc32; //crc32 of all cartridges (base+slot(s))
bool loaded; //is a base cartridge inserted?
unsigned crc32; //crc32 of all cartridges (base+slot(s))
unsigned rom_size;
unsigned ram_size;
bool firmware_appended; //true if firmware is appended to end of ROM data
Mode mode;
Type type;
@ -106,6 +107,8 @@ struct SuperFamicomCartridge {
};
SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size) {
firmware_appended = false;
//skip copier header
if((size & 0x7fff) == 512) data += 512, size -= 512;
@ -122,35 +125,49 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
const char *range = (rom_size > 0x200000) || (ram_size > 32 * 1024) ? "0000-7fff" : "0000-ffff";
markup.append("cartridge region=", region == NTSC ? "NTSC" : "PAL", "\n");
if(type == TypeSuperGameBoy1Bios || type == TypeSuperGameBoy2Bios) markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" map id=rom address=00-7f,80-ff:8000-ffff\n"
" icd2 revision=1\n"
" rom name=boot.rom size=0x100\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
);
if(type == TypeSuperGameBoy1Bios || type == TypeSuperGameBoy2Bios) {
markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" map id=rom address=00-7f,80-ff:8000-ffff\n"
" icd2 revision=1\n"
" rom name=boot.rom size=0x100\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
);
if((rom_size & 0x7fff) == 0x100) {
firmware_appended = true;
rom_size -= 0x100;
}
}
else if(has_cx4) markup.append(
" hitachidsp model=HG51B169 frequency=20000000\n"
" rom id=program name=program.rom size=0x", hex(rom_size), "\n"
" rom id=data name=cx4.data.rom size=0xc00\n"
" ram id=data size=0xc00\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
" map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000\n"
" map id=ram address=70-77:0000-7fff\n"
);
else if(has_cx4) {
markup.append(
" hitachidsp model=HG51B169 frequency=20000000\n"
" rom id=program name=program.rom size=0x", hex(rom_size), "\n"
" rom id=data name=cx4.data.rom size=0xc00\n"
" ram id=data size=0xc00\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
" map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000\n"
" map id=ram address=70-77:0000-7fff\n"
);
if((rom_size & 0x7fff) == 0xc00) {
firmware_appended = true;
rom_size -= 0xc00;
}
}
else if(has_spc7110) markup.append(
" spc7110\n"
" rom id=program name=program.rom size=0x100000\n"
" rom id=data name=data.rom size=0x", hex(rom_size - 0x100000), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=io address=00-3f,80-bf:4800-483f\n"
" map id=io address=50:0000-ffff\n"
" map id=rom address=00-3f,80-bf:8000-ffff\n"
" map id=rom address=c0-ff:0000-ffff\n"
" map id=ram address=00-3f,80-bf:6000-7fff mask=0xe000\n"
);
else if(has_spc7110) {
markup.append(
" spc7110\n"
" rom id=program name=program.rom size=0x100000\n"
" rom id=data name=data.rom size=0x", hex(rom_size - 0x100000), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=io address=00-3f,80-bf:4800-483f\n"
" map id=io address=50:0000-ffff\n"
" map id=rom address=00-3f,80-bf:8000-ffff\n"
" map id=rom address=c0-ff:0000-ffff\n"
" map id=ram address=00-3f,80-bf:6000-7fff mask=0xe000\n"
);
}
else if(has_sdd1) {
markup.append(
@ -280,69 +297,83 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
);
}
else if(mapper == BSCLoROM) markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=rom address=00-1f:8000-ffff offset=0x000000 mask=0x8000\n"
" map id=rom address=20-3f:8000-ffff offset=0x100000 mask=0x8000\n"
" map id=rom address=80-9f:8000-ffff offset=0x200000 mask=0x8000\n"
" map id=rom address=a0-bf:8000-ffff offset=0x100000 mask=0x8000\n"
" map id=ram address=70-7f,f0-ff:0000-7fff\n"
" bsxslot\n"
" map id=rom address=c0-ef:0000-ffff\n"
);
else if(mapper == BSCLoROM) {
markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=rom address=00-1f:8000-ffff offset=0x000000 mask=0x8000\n"
" map id=rom address=20-3f:8000-ffff offset=0x100000 mask=0x8000\n"
" map id=rom address=80-9f:8000-ffff offset=0x200000 mask=0x8000\n"
" map id=rom address=a0-bf:8000-ffff offset=0x100000 mask=0x8000\n"
" map id=ram address=70-7f,f0-ff:0000-7fff\n"
" bsxslot\n"
" map id=rom address=c0-ef:0000-ffff\n"
);
}
else if(mapper == BSCHiROM) markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=rom address=00-1f,80-9f:8000-ffff\n"
" map id=rom address=40-5f,c0-df:0000-ffff\n"
" map id=ram address=20-3f,a0-bf:6000-7fff\n"
" bsxslot\n"
" map id=rom address=20-3f,a0-bf:8000-ffff\n"
" map id=rom address=60-7f,e0-ff:0000-ffff\n"
);
else if(mapper == BSCHiROM) {
markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram name=save.ram size=0x", hex(ram_size), "\n"
" map id=rom address=00-1f,80-9f:8000-ffff\n"
" map id=rom address=40-5f,c0-df:0000-ffff\n"
" map id=ram address=20-3f,a0-bf:6000-7fff\n"
" bsxslot\n"
" map id=rom address=20-3f,a0-bf:8000-ffff\n"
" map id=rom address=60-7f,e0-ff:0000-ffff\n"
);
}
else if(mapper == BSXROM) markup.append(
" bsx\n"
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram id=save name=save.ram size=0x", hex(ram_size), "\n"
" ram id=download name=bsx.ram size=0x40000\n"
" map id=io address=00-3f,80-bf:5000-5fff\n"
" map id=rom address=00-3f,80-bf:8000-ffff\n"
" map id=rom address=40-7f,c0-ff:0000-ffff\n"
" map id=ram address=20-3f:6000-7fff\n"
);
else if(mapper == BSXROM) {
markup.append(
" bsx\n"
" rom name=program.rom size=0x", hex(rom_size), "\n"
" ram id=save name=save.ram size=0x", hex(ram_size), "\n"
" ram id=download name=bsx.ram size=0x40000\n"
" map id=io address=00-3f,80-bf:5000-5fff\n"
" map id=rom address=00-3f,80-bf:8000-ffff\n"
" map id=rom address=40-7f,c0-ff:0000-ffff\n"
" map id=ram address=20-3f:6000-7fff\n"
);
}
else if(mapper == STROM) markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" map id=rom address='00-1f,80-9f:8000-ffff mask=0x8000\n"
" sufamiturbo\n"
" slot id=A\n"
" map id=rom address=20-3f,a0-bf:8000-ffff mask=0x8000\n"
" map id=ram address=60-63,e0-e3:8000-ffff\n"
" slot id=B\n"
" map id=rom address=40-5f,c0-df:8000-ffff mask=0x8000\n"
" map id=ram address=70-73,f0-f3:8000-ffff\n"
);
else if(mapper == STROM) {
markup.append(
" rom name=program.rom size=0x", hex(rom_size), "\n"
" map id=rom address='00-1f,80-9f:8000-ffff mask=0x8000\n"
" sufamiturbo\n"
" slot id=A\n"
" map id=rom address=20-3f,a0-bf:8000-ffff mask=0x8000\n"
" map id=ram address=60-63,e0-e3:8000-ffff\n"
" slot id=B\n"
" map id=rom address=40-5f,c0-df:8000-ffff mask=0x8000\n"
" map id=ram address=70-73,f0-f3:8000-ffff\n"
);
}
if(has_spc7110rtc) markup.append(
" epsonrtc\n"
" ram name=rtc.ram size=0x10\n"
" map id=io address=00-3f,80-bf:4840-4842\n"
);
if(has_spc7110rtc) {
markup.append(
" epsonrtc\n"
" ram name=rtc.ram size=0x10\n"
" map id=io address=00-3f,80-bf:4840-4842\n"
);
}
if(has_srtc) markup.append(
" sharprtc\n"
" ram name=rtc.ram size=0x10\n"
" map id=io address=00-3f,80-bf:2800-2801\n"
);
if(has_srtc) {
markup.append(
" sharprtc\n"
" ram name=rtc.ram size=0x10\n"
" map id=io address=00-3f,80-bf:2800-2801\n"
);
}
if(has_obc1) markup.append(
" obc1\n"
" ram name=save.ram size=0x2000\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
);
if(has_obc1) {
markup.append(
" obc1\n"
" ram name=save.ram size=0x2000\n"
" map id=io address=00-3f,80-bf:6000-7fff\n"
);
}
if(has_dsp1) {
markup.append(
@ -360,57 +391,97 @@ SuperFamicomCartridge::SuperFamicomCartridge(const uint8_t *data, unsigned size)
if(dsp1_mapper == DSP1HiROM) markup.append(
" map id=io address=00-1f,80-9f:6000-7fff select=0x1000\n"
);
if((size & 0x7fff) == 0x2000) {
firmware_appended = true;
rom_size -= 0x2000;
}
}
if(has_dsp2) markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp2.program.rom size=0x1800\n"
" rom id=data name=dsp2.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
);
if(has_dsp2) {
markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp2.program.rom size=0x1800\n"
" rom id=data name=dsp2.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
);
if((size & 0x7fff) == 0x2000) {
firmware_appended = true;
rom_size -= 0x2000;
}
}
if(has_dsp3) markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp3.program.rom size=0x1800\n"
" rom id=data name=dsp3.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
);
if(has_dsp3) {
markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp3.program.rom size=0x1800\n"
" rom id=data name=dsp3.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map id=io address=20-3f,a0-bf:8000-ffff select=0x4000\n"
);
if((size & 0x7fff) == 0x2000) {
firmware_appended = true;
rom_size -= 0x2000;
}
}
if(has_dsp4) markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp4.program.rom size=0x1800\n"
" rom id=data name=dsp4.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map address=30-3f,b0-bf:8000-ffff select=0x4000\n"
);
if(has_dsp4) {
markup.append(
" necdsp model=uPD7725 frequency=8000000\n"
" rom id=program name=dsp4.program.rom size=0x1800\n"
" rom id=data name=dsp4.data.rom size=0x800\n"
" ram id=data size=0x200\n"
" map address=30-3f,b0-bf:8000-ffff select=0x4000\n"
);
if((size & 0x7fff) == 0x2000) {
firmware_appended = true;
rom_size -= 0x2000;
}
}
if(has_st010) markup.append(
" necdsp model=uPD96050 frequency=11000000\n"
" rom id=program name=st010.program.rom size=0xc000\n"
" rom id=data name=st010.data.rom size=0x1000\n"
" ram id=data name=save.ram size=0x1000\n"
" map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
" map id=ram address=68-6f,e8-ef:0000-7fff\n"
);
if(has_st010) {
markup.append(
" necdsp model=uPD96050 frequency=11000000\n"
" rom id=program name=st010.program.rom size=0xc000\n"
" rom id=data name=st010.data.rom size=0x1000\n"
" ram id=data name=save.ram size=0x1000\n"
" map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
" map id=ram address=68-6f,e8-ef:0000-7fff\n"
);
if((size & 0xffff) == 0xd000) {
firmware_appended = true;
rom_size -= 0xd000;
}
}
if(has_st011) markup.append(
" necdsp model=uPD96050 frequency=15000000\n"
" rom id=program name=st011.program.rom size=0xc000\n"
" rom id=data name=st011.data.rom size=0x1000\n"
" ram id=data name=save.ram size=0x1000\n"
" map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
" map id=ram address=68-6f,e8-ef:0000-7fff\n"
);
if(has_st011) {
markup.append(
" necdsp model=uPD96050 frequency=15000000\n"
" rom id=program name=st011.program.rom size=0xc000\n"
" rom id=data name=st011.data.rom size=0x1000\n"
" ram id=data name=save.ram size=0x1000\n"
" map id=io address=60-67,e0-e7:0000-3fff select=0x0001\n"
" map id=ram address=68-6f,e8-ef:0000-7fff\n"
);
if((size & 0xffff) == 0xd000) {
firmware_appended = true;
rom_size -= 0xd000;
}
}
if(has_st018) markup.append(
" armdsp frequency=21477272\n"
" rom id=program name=st018.program.rom size=0x20000\n"
" rom id=data name=st018.data.rom size=0x8000\n"
" ram name=save.ram size=0x4000\n"
" map id=io address=00-3f,80-bf:3800-38ff\n"
);
if(has_st018) {
markup.append(
" armdsp frequency=21477272\n"
" rom id=program name=st018.program.rom size=0x20000\n"
" rom id=data name=st018.data.rom size=0x8000\n"
" ram name=save.ram size=0x4000\n"
" map id=io address=00-3f,80-bf:3800-38ff\n"
);
if((size & 0x3ffff) == 0x28000) {
firmware_appended = true;
rom_size -= 0x28000;
}
}
}
void SuperFamicomCartridge::read_header(const uint8_t *data, unsigned size) {
@ -464,6 +535,7 @@ void SuperFamicomCartridge::read_header(const uint8_t *data, unsigned size) {
ram_size = 1024 << (data[index + RamSize] & 7);
if(ram_size == 1024) ram_size = 0; //no RAM present
if(rom_size == 0 && ram_size) ram_size = 0; //fix for Bazooka Blitzkrieg's malformed header (swapped ROM and RAM sizes)
//0, 1, 13 = NTSC; 2 - 12 = PAL
region = (regionid <= 1 || regionid >= 13) ? NTSC : PAL;

8
higan/nall/file.hpp
View File

@ -74,6 +74,14 @@ namespace nall {
return true;
}
static bool write(const string &filename, const string &text) {
file fp;
if(fp.open(filename, mode::write) == false) return false;
fp.print(text);
fp.close();
return true;
}
static bool write(const string &filename, const vector<uint8_t> &buffer) {
file fp;
if(fp.open(filename, mode::write) == false) return false;

1
higan/nall/string/base.hpp
View File

@ -119,6 +119,7 @@ namespace nall {
inline optional<unsigned> find(const char*) const;
inline string concatenate(const char*) const;
inline void append() {}
inline void isort();
template<typename... Args> inline void append(const string&, Args&&...);
template<unsigned Limit = 0> inline lstring& split(const char*, const char*);

6
higan/nall/string/core.hpp
View File

@ -151,6 +151,12 @@ template<typename... Args> void lstring::append(const string &data, Args&&... ar
append(std::forward<Args>(args)...);
}
void lstring::isort() {
nall::sort(pool, objectsize, [](const string &x, const string &y) {
return istrcmp(x, y) < 0;
});
}
bool lstring::operator==(const lstring &source) const {
if(this == &source) return true;
if(size() != source.size()) return false;

4
higan/phoenix/core/core.cpp
View File

@ -674,6 +674,10 @@ bool Widget::enabled() {
return state.enabled;
}
bool Widget::focused() {
return p.focused();
}
string Widget::font() {
return state.font;
}

1
higan/phoenix/core/core.hpp
View File

@ -333,6 +333,7 @@ struct Layout : private nall::base_from_member<pLayout&>, Sizable {
struct Widget : private nall::base_from_member<pWidget&>, Sizable {
bool enabled();
bool focused();
nall::string font();
Geometry geometry();
Geometry minimumGeometry();

4
higan/phoenix/gtk/platform.hpp
View File

@ -231,6 +231,7 @@ struct pWidget : public pSizable {
GtkWidget *gtkWidget;
bool enabled();
virtual bool focused();
virtual Geometry minimumGeometry();
void setEnabled(bool enabled);
virtual void setFocused();
@ -310,6 +311,7 @@ struct pHexEdit : public pWidget {
GtkTextBuffer *textBuffer;
GtkTextMark *textCursor;
bool focused();
void setColumns(unsigned columns);
void setLength(unsigned length);
void setOffset(unsigned offset);
@ -396,6 +398,7 @@ struct pListView : public pWidget {
void append(const lstring &text);
void autoSizeColumns();
bool checked(unsigned row);
bool focused();
void modify(unsigned row, const lstring &text);
void remove(unsigned row);
void reset();
@ -449,6 +452,7 @@ struct pTextEdit : public pWidget {
GtkWidget *subWidget;
GtkTextBuffer *textBuffer;
bool focused();
void setCursorPosition(unsigned position);
void setEditable(bool editable);
void setText(const string &text);

4
higan/phoenix/gtk/widget/hex-edit.cpp
View File

@ -7,6 +7,10 @@ static bool HexEdit_scroll(GtkRange *range, GtkScrollType scroll, gdouble value,
return false;
}
bool pHexEdit::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pHexEdit::setColumns(unsigned columns) {
setScroll();
update();

4
higan/phoenix/gtk/widget/list-view.cpp
View File

@ -35,6 +35,10 @@ bool pListView::checked(unsigned row) {
return state;
}
bool pListView::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pListView::modify(unsigned row, const lstring &text) {
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(subWidget));
GtkTreeIter iter;

4
higan/phoenix/gtk/widget/text-edit.cpp
View File

@ -3,6 +3,10 @@ static void TextEdit_change(TextEdit *self) {
if(self->p.locked == false && self->onChange) self->onChange();
}
bool pTextEdit::focused() {
return GTK_WIDGET_HAS_FOCUS(subWidget);
}
void pTextEdit::setCursorPosition(unsigned position) {
GtkTextMark *mark = gtk_text_buffer_get_mark(textBuffer, "insert");
GtkTextIter iter;

12
higan/phoenix/gtk/widget/widget.cpp
View File

@ -1,11 +1,15 @@
Geometry pWidget::minimumGeometry() {
return { 0, 0, 0, 0 };
}
bool pWidget::enabled() {
return gtk_widget_get_sensitive(gtkWidget);
}
bool pWidget::focused() {
return GTK_WIDGET_HAS_FOCUS(gtkWidget);
}
Geometry pWidget::minimumGeometry() {
return {0, 0, 0, 0};
}
void pWidget::setEnabled(bool enabled) {
if(widget.state.abstract) enabled = false;
if(sizable.state.layout && sizable.state.layout->enabled() == false) enabled = false;

1
higan/phoenix/gtk/window.cpp
View File

@ -30,6 +30,7 @@ static gboolean Window_expose(GtkWidget *widget, GdkEvent *event, Window *window
static gboolean Window_configure(GtkWidget *widget, GdkEvent *event, Window *window) {
if(gtk_widget_get_realized(window->p.widget) == false) return false;
if(window->visible() == false) return false;
GdkWindow *gdkWindow = gtk_widget_get_window(widget);
GdkRectangle border, client;

2
higan/phoenix/qt/platform.moc
View File

@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'platform.moc.hpp'
**
** Created: Thu Aug 9 18:10:14 2012
** Created: Fri Dec 21 17:46:20 2012
** by: The Qt Meta Object Compiler version 62 (Qt 4.6.3)
**
** WARNING! All changes made in this file will be lost!

1
higan/phoenix/qt/platform.moc.hpp
View File

@ -266,6 +266,7 @@ struct pWidget : public pSizable {
Widget &widget;
QWidget *qtWidget;
bool focused();
virtual Geometry minimumGeometry();
void setEnabled(bool enabled);
void setFocused();

6
higan/phoenix/qt/widget/widget.cpp
View File

@ -1,5 +1,9 @@
bool pWidget::focused() {
return qtWidget->hasFocus();
}
Geometry pWidget::minimumGeometry() {
return { 0, 0, 0, 0 };
return {0, 0, 0, 0};
}
void pWidget::setEnabled(bool enabled) {

1
higan/phoenix/reference/platform.hpp
View File

@ -183,6 +183,7 @@ struct pWidget : public pSizable {
Widget &widget;
bool enabled();
bool focused();
Geometry minimumGeometry();
void setEnabled(bool enabled);
void setFocused();

6
higan/phoenix/reference/widget/widget.cpp
View File

@ -2,8 +2,12 @@ bool pWidget::enabled() {
return false;
}
bool pWidget::focused() {
return false;
}
Geometry pWidget::minimumGeometry() {
return { 0, 0, 0, 0 };
return {0, 0, 0, 0};
}
void pWidget::setEnabled(bool enabled) {

1
higan/phoenix/windows/platform.hpp
View File

@ -223,6 +223,7 @@ struct pWidget : public pSizable {
HFONT hfont;
bool enabled();
bool focused();
virtual Geometry minimumGeometry();
void setEnabled(bool enabled);
void setFocused();

6
higan/phoenix/windows/widget/widget.cpp
View File

@ -2,8 +2,12 @@ bool pWidget::enabled() {
return IsWindowEnabled(hwnd);
}
bool pWidget::focused() {
return GetFocus() == hwnd;
}
Geometry pWidget::minimumGeometry() {
return { 0, 0, 0, 0 };
return {0, 0, 0, 0};
}
void pWidget::setEnabled(bool enabled) {

9
higan/profile/BS-X Satellaview.sfc/manifest.bml
View File

@ -1,9 +0,0 @@
cartridge region=NTSC
bsx
rom name=program.rom size=0x100000
ram id=save name=save.ram size=0x8000
ram id=download name=bsx.ram size=0x40000
map id=io address=00-3f,80-bf:5000-5fff
map id=rom address=00-3f,80-bf:8000-ffff
map id=rom address=40-7f,c0-ff:0000-7fff
map id=ram address=20-3f:6000-7fff

10
higan/profile/Sufami Turbo.sfc/manifest.bml
View File

@ -1,10 +0,0 @@
cartridge region=NTSC
rom name=program.rom size=0x40000
map id=rom address=00-1f,80-9f:8000-ffff mask=0x8000
sufamiturbo
slot id=A
map id=rom address=20-3f,a0-bf:8000-ffff mask=0x8000
map id=ram address=60-63,e0-e3:8000-ffff
slot id=B
map id=rom address=40-5f,c0-df:8000-ffff mask=0x8000
map id=ram address=70-73,f0-f3:8000-ffff

BIN
higan/profile/Super Game Boy.sfc/boot.rom
View File

Binary file not shown.

6
higan/profile/Super Game Boy.sfc/manifest.bml
View File

@ -1,6 +0,0 @@
cartridge region=NTSC
rom name=program.rom size=0x80000
map id=rom address=00-7f,80-ff:8000-ffff mask=0x8000
icd2 revision=1
rom name=boot.rom size=0x100
map id=io address=00-3f,80-bf:6000-7fff

68
higan/sfc/cartridge/cartridge.cpp
View File

@ -7,6 +7,30 @@ namespace SuperFamicom {
#include "serialization.cpp"
Cartridge cartridge;
string Cartridge::title() {
if(information.title.gameBoy.empty() == false) {
return information.title.gameBoy;
}
if(information.title.satellaview.empty() == false) {
if(has_bs_cart()) {
return information.title.satellaview;
} else {
return {information.title.cartridge, " + ", information.title.satellaview};
}
}
if(information.title.sufamiTurboA.empty() == false) {
if(information.title.sufamiTurboB.empty() == true) {
return information.title.sufamiTurboA;
} else {
return {information.title.sufamiTurboA, " + ", information.title.sufamiTurboB};
}
}
return information.title.cartridge;
}
void Cartridge::load(const string &manifest) {
region = Region::NTSC;
@ -29,6 +53,12 @@ void Cartridge::load(const string &manifest) {
has_hsu1 = false;
has_msu1 = false;
information.title.cartridge = "";
information.title.gameBoy = "";
information.title.satellaview = "";
information.title.sufamiTurboA = "";
information.title.sufamiTurboB = "";
this->manifest = manifest;
parse_markup(manifest);
//print(manifest, "\n\n");
@ -45,7 +75,15 @@ void Cartridge::load(const string &manifest) {
//Sufami Turbo
else if(cartridge.has_st_slots()) {
sha256 = nall::sha256(sufamiturbo.slotA.rom.data(), sufamiturbo.slotA.rom.size());
sha256_ctx sha;
uint8_t hash[32];
sha256_init(&sha);
sha256_chunk(&sha, sufamiturbo.slotA.rom.data(), sufamiturbo.slotA.rom.size());
sha256_chunk(&sha, sufamiturbo.slotB.rom.data(), sufamiturbo.slotB.rom.size());
sha256_final(&sha);
string result;
for(auto &byte : hash) result.append(hex<2>(byte));
sha256 = result;
}
//Super Famicom
@ -86,9 +124,10 @@ void Cartridge::load(const string &manifest) {
}
void Cartridge::load_super_game_boy(const string &manifest) {
XML::Document document(manifest);
auto rom = document["release/cartridge/rom"];
auto ram = document["release/cartridge/ram"];
auto document = Markup::Document(manifest);
information.title.gameBoy = document["information/title"].text();
auto rom = document["cartridge/rom"];
auto ram = document["cartridge/ram"];
GameBoy::cartridge.load(GameBoy::System::Revision::SuperGameBoy, manifest);
@ -98,8 +137,9 @@ void Cartridge::load_super_game_boy(const string &manifest) {
}
void Cartridge::load_satellaview(const string &manifest) {
XML::Document document(manifest);
auto rom = document["release/cartridge/rom"];
auto document = Markup::Document(manifest);
information.title.satellaview = document["information/title"].text();
auto rom = document["cartridge/rom"];
if(rom["name"].exists()) {
unsigned size = numeral(rom["size"].data);
@ -109,9 +149,10 @@ void Cartridge::load_satellaview(const string &manifest) {
}
void Cartridge::load_sufami_turbo_a(const string &manifest) {
XML::Document document(manifest);
auto rom = document["release/cartridge/rom"];
auto ram = document["release/cartridge/ram"];
auto document = Markup::Document(manifest);
information.title.sufamiTurboA = document["information/title"].text();
auto rom = document["cartridge/rom"];
auto ram = document["cartridge/ram"];
if(rom["name"].exists()) {
unsigned size = numeral(rom["size"].data);
@ -126,15 +167,16 @@ void Cartridge::load_sufami_turbo_a(const string &manifest) {
memory.append({ID::SufamiTurboSlotARAM, ram["name"].data});
}
if(document["cartridge"]["linkable"].data == "true") {
if(document["cartridge/linkable"].exists()) {
interface->loadRequest(ID::SufamiTurboSlotB, "Sufami Turbo - Slot B", "st");
}
}
void Cartridge::load_sufami_turbo_b(const string &manifest) {
XML::Document document(manifest);
auto rom = document["release/cartridge/rom"];
auto ram = document["release/cartridge/ram"];
auto document = Markup::Document(manifest);
information.title.sufamiTurboB = document["information/title"].text();
auto rom = document["cartridge/rom"];
auto ram = document["cartridge/ram"];
if(rom["name"].exists()) {
unsigned size = numeral(rom["size"].data);

11
higan/sfc/cartridge/cartridge.hpp
View File

@ -61,6 +61,17 @@ struct Cartridge : property<Cartridge> {
};
vector<Memory> memory;
struct Information {
struct Title {
string cartridge;
string gameBoy;
string satellaview;
string sufamiTurboA;
string sufamiTurboB;
} title;
} information;
string title();
void load(const string &manifest);
void load_super_game_boy(const string &manifest);
void load_satellaview(const string &manifest);

6
higan/sfc/cartridge/markup.cpp
View File

@ -1,9 +1,13 @@
#ifdef CARTRIDGE_CPP
void Cartridge::parse_markup(const char *markup) {
auto cartridge = Markup::Document(markup)["cartridge"];
auto document = Markup::Document(markup);
auto cartridge = document["cartridge"];
auto information = document["information"];
region = cartridge["region"].data != "PAL" ? Region::NTSC : Region::PAL;
this->information.title.cartridge = information["title"].text();
mapping.reset();
parse_markup_cartridge(cartridge);
parse_markup_icd2(cartridge["icd2"]);

70
higan/sfc/chip/event-skeleton/event.cpp Normal file
View File

@ -0,0 +1,70 @@
#include <sfc/sfc.hpp>
#define EVENT_CPP
namespace SuperFamicom {
Event event;
void Event::Enter() { event.enter(); }
void Event::enter() {
while(true) {
if(scheduler.sync == Scheduler::SynchronizeMode::All) {
scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
}
}
step(1);
synchronize_cpu();
}
void Event::init() {
}
void Event::load() {
}
void Event::unload() {
rom[0].reset();
rom[1].reset();
rom[2].reset();
rom[3].reset();
ram.reset();
}
void Event::power() {
}
void Event::reset() {
create(Event::Enter, 1);
}
//DSP-1
uint8 Event::sr(unsigned addr) {
return 0;
}
//DSP-1
void Event::dr(unsigned addr, uint8 data) {
}
//is there bank-switching?
uint8 Event::rom_read(unsigned addr) {
return cpu.regs.mdr;
}
//is there read-protection?
uint8 Event::ram_read(unsigned addr) {
return cpu.regs.mdr;
}
//is there write-protection?
void Event::ram_write(unsigned addr, uint8 data) {
}
void Event::serialize(serializer &s) {
Thread::serialize(s);
s.array(ram.data(), ram.size());
}
}

37
higan/sfc/chip/event-skeleton/event.hpp Normal file
View File

@ -0,0 +1,37 @@
//SNES-EVENT board emulation (skeleton):
//* Campus Challenge '92
//* Powerfest '94
struct Event : Coprocessor {
MappedRAM rom[4];
MappedRAM ram;
static void Enter();
void enter();
void init();
void load();
void unload();
void power();
void reset();
uint8 sr(unsigned);
void dr(unsigned, uint8 data);
uint8 rom_read(unsigned addr);
uint8 ram_read(unsigned addr);
void ram_write(unsigned addr, uint8 data);
void serialize(serializer&);
//private:
enum class Board : unsigned { CampusChallenge92, Powerfest94 } board;
unsigned revision;
unsigned timer;
string host;
unsigned port;
string path;
string username;
string password;
};
extern Event event;

149
higan/sfc/chip/event/event.cpp
View File

@ -12,10 +12,87 @@ void Event::enter() {
if(scheduler.sync == Scheduler::SynchronizeMode::All) {
scheduler.exit(Scheduler::ExitReason::SynchronizeEvent);
}
if(scoreActive && scoreSecondsRemaining) {
if(--scoreSecondsRemaining == 0) {
scoreActive = false;
submitScore();
}
}
if(timerActive && timerSecondsRemaining) {
if(--timerSecondsRemaining == 0) {
timerActive = false;
status |= 0x02; //time over
scoreActive = true;
scoreSecondsRemaining = 5;
}
}
step(1);
synchronize_cpu();
}
}
void Event::submitScore() {
if(usedSaveState) return;
string data;
data.append("timer=", timer, ";");
if(board == Board::CampusChallenge92) {
unsigned mw = 0, fz = 0, pw = 0;
for(unsigned n = 0x0408; n <= 0x040e; n++) mw = mw * 10 + ram.read(n);
for(unsigned n = 0x0413; n >= 0x0410; n--) fz = fz * 10 + ram.read(n);
for(unsigned n = 0x0418; n >= 0x0415; n--) pw = pw * 10 + ram.read(n);
data.append("mw=", mw, ";");
data.append("fz=", fz, ";");
data.append("pw=", pw);
}
if(board == Board::Powerfest94) {
unsigned ml = 0, mk[2] = {0}, ba[2] = {0};
for(unsigned n = 0x0408; n <= 0x040e; n++) ml = ml * 10 + ram.read(n);
for(unsigned n = 0x0413; n >= 0x0412; n--) mk[0] = mk[0] * 10 + ram.read(n);
for(unsigned n = 0x0411; n >= 0x0410; n--) mk[1] = mk[1] * 10 + ram.read(n);
for(unsigned n = 0x0418; n >= 0x0415; n--) ba[0] = ba[0] * 10 + ram.read(n);
for(unsigned n = 0x041a; n >= 0x0419; n--) ba[1] = ba[1] * 10 + ram.read(n);
data.append("ml=", ml, ";");
data.append("mk=", mk[0], ",", mk[1], ";");
data.append("ba=", ba[0], ",", ba[1]);
}
step(1);
synchronize_cpu();
lstring side = interface->server().split<1>("@");
string username = side(0).split<1>(":")(0);
string password = side(0).split<1>(":")(1);
side(1).ltrim<1>("http://");
string hostname = side(1).split<1>("/")(0);
string hostpath = side(1).split<1>("/")(1);
side = hostname.split<1>(":");
hostname = side(0);
string hostport = side(1);
if(hostport.empty()) hostport = "80";
http server;
if(server.connect(hostname, decimal(hostport))) {
string content = {
"username:", username, "\n",
"password:", password, "\n",
"emulator:bsnes\n",
"sha256:", interface->sha256(), "\n",
"\n",
data
};
string packet = {
"POST /", hostpath, " HTTP/1.0\r\n",
"Host: ", hostname, "\r\n",
"Connection: close\r\n",
"Content-Type: application/octet-stream\r\n",
"Content-Length: ", content.length(), "\r\n",
"\r\n",
content
};
server.send(packet);
server.disconnect();
}
}
void Event::init() {
@ -33,38 +110,88 @@ void Event::unload() {
}
void Event::power() {
usedSaveState = false;
}
void Event::reset() {
create(Event::Enter, 1);
for(unsigned n = 0; n < ram.size(); n++) ram.write(n, 0x00);
status = 0x00;
select = 0x00;
timerActive = false;
scoreActive = false;
timerSecondsRemaining = 0;
scoreSecondsRemaining = 0;
usedSaveState = false;
}
//DSP-1
uint8 Event::sr(unsigned addr) {
return 0;
uint8 Event::sr(unsigned) {
return status;
}
//DSP-1
void Event::dr(unsigned addr, uint8 data) {
void Event::dr(unsigned, uint8 data) {
select = data;
if(timer && data == 0x09) {
timerActive = true;
timerSecondsRemaining = timer;
}
}
//is there bank-switching?
uint8 Event::rom_read(unsigned addr) {
if(board == Board::CampusChallenge92) {
unsigned id = 0;
if(select == 0x09) id = 1;
if(select == 0x05) id = 2;
if(select == 0x03) id = 3;
if((addr & 0x808000) == 0x808000) id = 0;
if(addr & 0x008000) {
addr = ((addr & 0x7f0000) >> 1) | (addr & 0x7fff);
return rom[id].read(bus.mirror(addr, rom[id].size()));
}
}
if(board == Board::Powerfest94) {
unsigned id = 0;
if(select == 0x09) id = 1;
if(select == 0x0c) id = 2;
if(select == 0x0a) id = 3;
if((addr & 0x208000) == 0x208000) id = 0;
if(addr & 0x400000) {
addr &= 0x3fffff;
return rom[id].read(bus.mirror(addr, rom[id].size()));
}
if(addr & 0x008000) {
addr &= 0x1fffff;
if(id != 2) addr = ((addr & 0x1f0000) >> 1) | (addr & 0x7fff);
return rom[id].read(bus.mirror(addr, rom[id].size()));
}
}
return cpu.regs.mdr;
}
//is there read-protection?
uint8 Event::ram_read(unsigned addr) {
return cpu.regs.mdr;
return ram.read(bus.mirror(addr, ram.size()));
}
//is there write-protection?
void Event::ram_write(unsigned addr, uint8 data) {
return ram.write(bus.mirror(addr, ram.size()), data);
}
void Event::serialize(serializer &s) {
Thread::serialize(s);
s.array(ram.data(), ram.size());
s.integer(status);
s.integer(select);
s.integer(timerActive);
s.integer(scoreActive);
s.integer(timerSecondsRemaining);
s.integer(scoreSecondsRemaining);
usedSaveState = true;
}
}

19
higan/sfc/chip/event/event.hpp
View File

@ -1,4 +1,4 @@
//SNES-EVENT board emulation (skeleton):
//SNES-EVENT board emulation:
//* Campus Challenge '92
//* Powerfest '94
@ -14,6 +14,8 @@ struct Event : Coprocessor {
void power();
void reset();
void submitScore();
uint8 sr(unsigned);
void dr(unsigned, uint8 data);
uint8 rom_read(unsigned addr);
@ -27,11 +29,16 @@ struct Event : Coprocessor {
unsigned revision;
unsigned timer;
string host;
unsigned port;
string path;
string username;
string password;
uint8 status;
uint8 select;
bool timerActive;
bool scoreActive;
unsigned timerSecondsRemaining;
unsigned scoreSecondsRemaining;
bool usedSaveState;
};
extern Event event;

12
higan/sfc/interface/interface.cpp
View File

@ -4,6 +4,10 @@ namespace SuperFamicom {
Interface *interface = nullptr;
string Interface::title() {
return cartridge.title();
}
double Interface::videoFrequency() {
switch(system.region()) { default:
case System::Region::NTSC: return system.cpu_frequency() / (262.0 * 1364.0 - 4.0);
@ -372,10 +376,10 @@ Interface::Interface() {
information.capability.states = true;
information.capability.cheats = true;
media.append({ID::SuperFamicom, "Super Famicom", "sfc"});
media.append({ID::SuperFamicom, "Super Famicom", "gb", "Super Game Boy.sfc"});
media.append({ID::SuperFamicom, "Super Famicom", "bs", "BS-X Satellaview.sfc"});
media.append({ID::SuperFamicom, "Super Famicom", "st", "Sufami Turbo.sfc"});
media.append({ID::SuperFamicom, "Super Famicom", "sfc", true});
media.append({ID::SuperFamicom, "Super Game Boy", "gb", false});
media.append({ID::SuperFamicom, "BS-X Satellaview", "bs", false});
media.append({ID::SuperFamicom, "Sufami Turbo", "st", false});
{
Device device{0, ID::Port1 | ID::Port2, "Controller"};

1
higan/sfc/interface/interface.hpp
View File

@ -81,6 +81,7 @@ struct ID {
};
struct Interface : Emulator::Interface {
string title();
double videoFrequency();
double audioFrequency();

72
higan/target-ethos/general/browser.cpp
View File

@ -6,15 +6,15 @@ Browser::Browser() {
windowManager->append(this, "Browser");
layout.setMargin(5);
pathBrowse.setText("Browse ...");
pathUp.setText("..");
homeButton.setImage({resource::home, sizeof resource::home});
upButton.setImage({resource::up, sizeof resource::up});
openButton.setText("Open");
append(layout);
layout.append(pathLayout, {~0, 0}, 5);
pathLayout.append(pathEdit, {~0, 0}, 5);
pathLayout.append(pathBrowse, {0, 0}, 5);
pathLayout.append(pathUp, {0, 0});
pathLayout.append(homeButton, {28, 28}, 5);
pathLayout.append(upButton, {28, 28});
layout.append(fileList, {~0, ~0}, 5);
layout.append(controlLayout, {~0, 0});
controlLayout.append(filterLabel, {~0, 0}, 5);
@ -27,17 +27,14 @@ Browser::Browser() {
setPath(path);
};
pathBrowse.onActivate = [&] {
string path = DialogWindow::folderSelect(*this, this->path);
if(!path.empty()) setPath(path);
homeButton.onActivate = [&] {
string pathname = {userpath(), "Emulation/"};
directory::create(pathname);
setPath(pathname);
};
pathUp.onActivate = [&] {
if(this->path == "/") return;
string path = this->path;
path.rtrim<1>("/");
path = dir(path);
setPath(path);
upButton.onActivate = [&] {
setPath(parentdir(path));
};
fileList.onChange = {&Browser::synchronize, this};
@ -91,24 +88,6 @@ void Browser::bootstrap() {
config.save(application->path("paths.cfg"));
}
void Browser::inputEvent(unsigned scancode, int16_t value) {
if(scancode == keyboard(0)[nall::Keyboard::Escape] && value == 0) onClose();
//proof of concept only, not very useful:
//joypad up/down moves around in the file list, any joypad button loads selected game
if(fileList.selected() == false) return;
unsigned selection = fileList.selection();
if(Joypad::isAnyHat(scancode)) {
if(value & Joypad::HatUp ) fileList.setSelection(selection - 1);
if(value & Joypad::HatDown) fileList.setSelection(selection + 1);
}
if(Joypad::isAnyButton(scancode) && value == 1) {
fileList.onActivate();
}
}
string Browser::select(const string &title, const string &extension) {
this->extension = extension;
@ -134,9 +113,20 @@ string Browser::select(const string &title, const string &extension) {
outputFilename = "";
dialogActive = true;
while(dialogActive == true) {
bool backspace = false;
using phoenix::Keyboard;
while(dialogActive) {
OS::processEvents();
inputManager->poll();
if(Keyboard::pressed(Keyboard::Scancode::Escape)) onClose();
if(Keyboard::pressed(Keyboard::Scancode::Backspace)) {
if(backspace == false) {
backspace = true;
if(fileList.focused()) upButton.onActivate();
}
} else {
backspace = false;
}
usleep(20 * 1000);
}
@ -165,7 +155,7 @@ void Browser::setPath(const string &path, unsigned selection) {
string name = filename;
name.rtrim<1>("/");
fileList.append(name);
fileList.setImage(filenameList.size(), 0, image(resource::folder, sizeof resource::folder));
fileList.setImage(filenameList.size(), 0, {resource::folder, sizeof resource::folder});
filenameList.append(filename);
}
}
@ -176,23 +166,11 @@ void Browser::setPath(const string &path, unsigned selection) {
string name = filename;
name.rtrim<1>(suffix);
fileList.append(name);
fileList.setImage(filenameList.size(), 0, image(resource::file, sizeof resource::file));
fileList.setImage(filenameList.size(), 0, {resource::game, sizeof resource::game});
filenameList.append(filename);
}
}
/* file loading: deprecated for ananke
for(auto &filename : contents) {
string suffix = {".", this->extension};
if(filename.endswith(suffix)) {
string name = filename;
name.rtrim<1>(suffix);
fileList.append(name);
fileList.setImage(filenameList.size(), 0, image(resource::file, sizeof resource::file));
filenameList.append(filename);
}
}*/
fileList.setSelection(selection);
fileList.setFocused();
synchronize();

5
higan/target-ethos/general/browser.hpp
View File

@ -2,15 +2,14 @@ struct Browser : Window {
VerticalLayout layout;
HorizontalLayout pathLayout;
LineEdit pathEdit;
Button pathBrowse;
Button pathUp;
Button homeButton;
Button upButton;
ListView fileList;
HorizontalLayout controlLayout;
Label filterLabel;
Button openButton;
string select(const string &title, const string &extension);
void inputEvent(unsigned scancode, int16_t value);
void saveConfiguration();
void synchronize();
void bootstrap();

23
higan/target-ethos/general/presentation.cpp
View File

@ -58,9 +58,8 @@ Presentation::Presentation() : active(nullptr) {
setMenuVisible();
setStatusVisible();
fileMenu.setText("File");
fileLoad.setText("Load Game ...");
loadMenu.setText("Library");
loadImport.setText("Import Game ...");
settingsMenu.setText("Settings");
videoMenu.setText("Video");
centerVideo.setText("Center");
@ -86,13 +85,11 @@ Presentation::Presentation() : active(nullptr) {
cheatEditor.setText("Cheat Editor");
synchronizeTime.setText("Synchronize Time");
if(application->ananke.opened()) append(fileMenu);
fileMenu.append(fileLoad);
append(loadMenu);
for(auto &item : loadListSystem) loadMenu.append(*item);
if(loadListSubsystem.size() > 0) {
loadMenu.append(*new Separator);
for(auto &item : loadListSubsystem) loadMenu.append(*item);
if(application->ananke.opened()) {
loadMenu.append(loadSeparator);
loadMenu.append(loadImport);
}
for(auto &systemItem : emulatorList) append(systemItem->menu);
append(settingsMenu);
@ -120,7 +117,7 @@ Presentation::Presentation() : active(nullptr) {
onSize = [&] { utility->resize(); };
onClose = [&] { application->quit = true; };
fileLoad.onActivate = [&] {
loadImport.onActivate = [&] {
if(application->ananke.opened() == false) return;
function<string ()> browse = application->ananke.sym("ananke_browse");
if(browse == false) return;
@ -156,17 +153,13 @@ void Presentation::bootstrap() {
iEmulator->interface = emulator;
for(auto &media : emulator->media) {
if(media.bootable == false) continue; //do not add sub-cartridge slot entries to menu
Item *item = new Item;
item->onActivate = [=, &media] {
utility->loadMedia(iEmulator->interface, media);
};
if(media.load.empty()) {
item->setText({media.name, " ..."});
loadListSystem.append(item);
} else {
item->setText({nall::basename(media.load), " ..."});
loadListSubsystem.append(item);
}
item->setText({media.name, " ..."});
loadListSystem.append(item);
}
iEmulator->menu.setText(emulator->information.name);

5
higan/target-ethos/general/presentation.hpp
View File

@ -20,11 +20,10 @@ struct Presentation : Window {
};
vector<Emulator*> emulatorList;
Menu fileMenu;
Item fileLoad;
Menu loadMenu;
vector<Item*> loadListSystem;
vector<Item*> loadListSubsystem;
Separator loadSeparator;
Item loadImport;
Menu settingsMenu;
Menu videoMenu;
RadioItem centerVideo;

3
higan/target-ethos/input/input.cpp
View File

@ -230,9 +230,6 @@ void InputManager::poll() {
for(unsigned n = 0; n < Scancode::Limit; n++) {
if(scancode[0][n] != scancode[1][n]) {
if(browser->focused()) {
browser->inputEvent(n, scancode[activeScancode][n]);
}
if(settings->focused()) {
inputSettings->inputEvent(n, scancode[activeScancode][n]);
hotkeySettings->inputEvent(n, scancode[activeScancode][n]);

BIN
higan/target-ethos/resource/cabinet.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 667 B

BIN
higan/target-ethos/resource/file.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 844 B

BIN
higan/target-ethos/resource/game.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
higan/target-ethos/resource/home.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 606 B

5
higan/target-ethos/resource/resource.bml
View File

@ -1,6 +1,5 @@
resource name=resource
binary id=cabinet name=cabinet.png
binary id=folder name=folder.png
binary id=file name=file.png
binary id=home name=home.png
binary id=up name=up.png
binary id=folder name=folder.png
binary id=game name=game.png

240
higan/target-ethos/resource/resource.cpp
View File

@ -1,27 +1,49 @@
namespace resource {
const uint8_t cabinet[667] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,2,82,73,68,65,84,88,133,237,148,205,107,19,
81,20,197,127,153,36,218,84,48,65,138,164,74,186,16,108,236,34,75,65,148,110,252,8,214,165,127,128,165,160,224,206,
86,93,136,46,92,186,16,138,244,95,40,93,235,170,136,85,112,163,130,11,65,92,104,235,194,133,133,150,154,106,172,249,
232,100,230,189,235,98,38,166,38,157,201,100,38,208,133,30,120,48,195,220,243,238,185,119,238,61,240,31,255,58,98,221,
2,46,93,200,223,32,158,124,148,140,119,13,237,128,105,105,12,81,183,22,151,62,205,134,82,119,177,56,54,51,115,245,
108,93,153,191,68,180,45,90,53,68,219,166,104,171,46,186,81,21,213,168,136,50,183,68,109,255,20,85,255,33,118,109,
83,236,90,73,236,234,134,216,149,117,217,46,125,150,235,147,227,245,137,226,137,219,94,57,60,203,154,40,230,239,141,100,
15,223,157,155,91,24,180,54,222,83,253,178,212,115,1,169,163,167,48,210,199,152,190,115,179,190,250,109,243,254,211,103,
203,15,3,11,56,127,110,76,22,159,188,196,92,123,75,45,68,242,38,6,142,156,36,150,62,206,229,169,41,158,191,248,
216,145,47,225,71,54,146,41,222,205,95,9,157,220,193,60,133,201,199,158,95,125,5,104,219,4,224,195,87,155,181,178,
238,57,245,112,198,160,144,75,32,170,17,82,128,178,0,88,47,107,78,143,38,187,175,204,14,8,240,102,197,162,144,195,
87,128,225,123,137,75,20,2,236,107,27,98,46,15,90,133,132,16,224,77,236,5,161,59,160,125,136,189,192,239,158,64,
67,184,27,94,173,116,118,231,204,104,210,227,158,144,2,154,191,160,249,63,219,231,32,63,84,253,243,188,92,58,240,55,
119,71,124,132,45,112,136,217,140,193,235,93,42,110,79,218,222,149,225,140,225,10,240,158,165,64,29,40,228,18,20,114,
126,145,254,8,61,3,205,214,69,53,162,240,67,232,18,247,204,136,116,223,140,40,162,19,70,133,223,16,118,233,64,159,
156,48,180,15,248,16,123,50,162,168,67,24,213,136,34,175,97,31,141,40,5,212,131,8,24,132,150,242,62,26,209,8,
80,6,74,128,242,18,16,3,210,224,40,207,141,79,35,162,64,43,68,52,162,21,136,66,180,123,68,187,223,154,239,10,
180,118,98,155,188,150,128,44,206,224,91,192,119,47,1,113,247,112,237,193,66,248,178,119,199,190,246,156,94,254,114,8,
24,2,50,192,0,93,214,53,0,76,55,113,21,167,253,171,128,246,19,0,206,28,28,4,246,247,65,128,237,38,220,2,
42,180,76,114,239,241,27,4,79,89,165,234,42,236,66,0,0,0,0,73,69,78,68,174,66,96,130,
const uint8_t home[606] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,0,31,243,255,
97,0,0,0,6,98,75,71,68,0,0,0,0,0,0,249,67,187,127,0,0,0,9,112,72,89,115,0,0,13,215,0,
0,13,215,1,66,40,155,120,0,0,0,7,116,73,77,69,7,213,10,14,20,37,19,83,42,210,59,0,0,1,235,73,
68,65,84,56,203,149,147,191,107,83,81,20,128,191,123,251,222,75,211,64,242,36,160,85,135,100,81,123,19,104,85,172,
17,92,28,140,66,19,167,135,212,74,39,145,162,163,24,92,58,180,110,193,169,254,24,234,212,37,139,245,199,96,19,240,
15,240,63,16,121,91,92,196,90,219,240,98,81,137,33,121,215,33,246,217,151,80,33,103,186,92,206,247,221,115,14,231,
194,1,225,41,85,172,128,174,128,246,148,122,200,48,177,7,123,74,105,79,169,61,73,113,104,120,177,56,163,203,55,111,
252,87,34,250,225,154,235,110,20,148,98,253,220,89,182,39,78,113,228,240,56,39,188,38,83,107,107,212,92,151,130,82,
215,14,185,110,117,64,176,31,126,83,156,97,247,248,49,148,202,50,22,141,210,106,181,24,219,252,74,182,92,30,144,136,
126,184,122,251,22,157,100,146,116,42,77,42,149,2,64,107,104,183,219,236,214,235,156,44,149,66,18,177,31,126,247,160,
68,199,48,201,229,46,96,219,118,208,154,214,26,0,223,247,249,185,181,69,114,110,46,144,136,10,232,130,82,188,127,84,
198,107,54,57,63,157,35,30,143,35,132,8,9,124,223,15,206,134,16,140,230,243,212,92,23,3,184,3,172,78,157,62,
195,253,210,61,54,170,111,3,240,201,202,51,86,30,63,69,139,17,116,167,133,48,70,209,221,223,44,47,45,209,238,165,
204,202,121,120,190,48,153,33,17,79,0,160,212,4,153,140,34,155,205,244,94,20,146,145,244,149,222,196,83,121,144,22,
90,107,22,38,51,204,195,186,236,239,211,178,44,76,211,196,48,140,224,254,75,227,7,0,31,234,59,116,187,126,144,11,
48,32,144,82,34,165,196,146,159,1,232,96,241,241,83,3,128,111,222,47,58,34,18,90,36,99,96,179,254,14,207,231,
40,0,151,46,78,115,53,26,67,234,113,46,75,147,237,77,66,21,24,253,21,252,155,126,239,165,239,222,14,162,217,56,
112,245,3,65,36,18,193,182,109,18,137,4,2,137,16,16,139,197,112,28,103,0,178,44,43,252,23,174,207,58,175,0,
135,225,98,245,229,139,215,119,255,0,86,248,213,163,133,187,128,26,0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t up[652] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0,0,31,243,255,
97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,
101,0,119,119,119,46,105,110,107,115,99,97,112,101,46,111,114,103,155,238,60,26,0,0,2,30,73,68,65,84,56,141,
149,147,79,104,19,65,20,198,191,55,187,51,217,141,133,122,104,76,255,209,130,4,237,193,64,42,168,208,213,138,104,68,
98,69,45,20,114,107,74,201,73,144,98,22,193,171,199,82,145,160,23,15,69,79,30,165,66,241,226,77,42,94,68,80,
208,67,41,180,42,149,148,52,137,166,154,38,217,217,25,15,81,172,33,169,246,29,223,251,230,199,124,223,155,33,173,53,
218,213,201,155,124,30,0,150,102,189,233,118,26,214,110,224,184,60,221,223,21,73,246,117,29,76,58,46,79,239,9,224,
184,60,26,16,251,178,87,206,76,6,199,70,147,193,128,8,102,29,151,71,255,11,224,184,188,3,132,197,137,115,211,214,
150,151,199,150,183,137,248,200,37,11,132,69,199,229,29,255,4,16,225,209,232,112,162,167,55,52,72,159,75,31,240,177,
244,30,157,157,157,20,27,58,209,13,194,195,93,1,142,203,211,253,7,34,137,179,71,199,249,74,254,13,12,198,97,50,
142,87,107,11,136,13,29,23,161,253,61,137,230,60,216,142,195,81,193,237,108,42,225,218,235,229,101,104,242,32,132,137,
58,125,199,54,21,241,46,255,28,23,78,95,13,154,166,248,43,15,182,211,247,212,88,198,82,228,161,34,75,16,1,1,
30,224,40,203,117,8,219,64,65,174,162,168,86,113,254,212,69,139,216,159,60,216,111,223,241,99,227,221,135,250,98,148,
175,172,193,228,6,56,55,80,81,5,84,141,175,16,54,131,176,25,150,191,189,64,184,55,68,71,14,15,135,137,53,242,
160,145,140,153,30,232,142,100,111,76,220,177,5,15,64,65,194,135,135,215,185,5,188,45,60,131,100,21,16,35,36,6,
50,208,90,67,41,160,94,175,225,241,211,249,74,177,180,57,99,18,67,234,83,110,197,158,185,119,185,225,137,163,122,247,
250,19,171,44,115,240,141,109,112,193,192,76,130,193,9,115,15,110,87,101,77,91,191,236,7,137,33,101,46,205,122,78,
211,38,180,214,10,165,250,23,48,131,96,112,6,30,104,64,100,77,91,47,231,60,218,245,29,0,128,210,62,126,212,139,
141,43,251,26,178,174,160,85,235,63,99,182,106,250,74,162,90,219,134,50,53,160,21,124,73,240,189,61,0,164,47,17,
31,188,6,98,0,49,2,17,246,0,32,108,220,186,63,25,110,37,38,194,70,115,239,39,48,247,197,219,182,208,154,34,
0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t folder[1176] = {
@ -64,134 +86,54 @@ const uint8_t folder[1176] = {
235,6,248,7,188,50,165,151,203,8,55,43,0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t file[844] = {
const uint8_t game[1490] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,3,3,73,68,65,84,88,133,229,151,79,110,212,
48,24,197,127,182,227,56,81,39,116,36,132,0,169,167,226,2,101,209,93,239,192,150,37,171,46,43,245,4,92,164,183,
40,82,89,21,36,134,84,76,18,59,44,90,91,142,243,103,50,21,59,62,201,138,227,120,236,247,189,247,252,37,3,255,
123,136,116,224,234,234,234,67,150,101,55,64,165,148,66,74,137,115,14,107,109,104,93,215,133,107,220,95,26,3,118,93,
215,125,188,185,185,249,26,239,151,141,16,9,113,125,113,113,81,61,247,195,120,223,247,131,121,241,253,202,126,117,121,121,
121,13,44,3,176,214,110,1,110,111,111,17,66,32,165,12,87,41,37,74,41,148,82,8,33,80,74,177,221,110,209,90,
15,158,167,125,33,4,251,253,158,166,105,182,233,126,50,29,232,251,30,33,68,104,64,88,208,55,207,78,215,117,24,99,
70,191,247,109,77,140,24,112,206,133,13,98,6,210,38,165,164,40,138,48,127,42,60,16,159,200,20,168,17,3,206,185,
17,11,177,4,49,40,231,28,77,211,28,204,114,137,141,17,0,107,109,232,207,177,224,159,41,165,208,90,31,100,97,9,
200,36,3,233,230,233,189,181,150,60,207,41,203,146,186,174,233,186,46,204,91,202,124,21,0,207,192,156,9,1,140,49,
20,69,65,93,215,100,89,70,158,231,3,173,231,50,127,17,128,88,123,127,239,105,55,198,96,140,161,109,219,85,174,95,
13,96,202,132,41,35,62,218,182,5,240,213,110,113,211,163,25,72,179,23,66,208,52,13,90,235,80,92,252,243,199,199,
199,229,244,97,210,172,7,37,136,93,47,165,164,170,42,178,44,67,8,193,201,201,73,232,151,101,57,152,63,197,194,139,
37,136,77,168,181,198,90,27,42,97,215,117,97,222,210,113,92,205,128,215,50,205,222,103,16,75,226,156,11,12,120,64,
62,203,41,38,142,146,32,213,190,239,123,172,181,225,69,228,105,143,193,214,117,141,115,110,86,134,163,0,196,11,11,33,
200,178,140,170,170,6,115,235,186,14,114,120,79,40,165,70,155,28,205,64,74,181,7,32,165,28,248,195,24,67,158,231,
1,172,82,106,117,89,158,5,144,158,231,212,7,113,40,165,6,12,120,169,210,170,184,20,171,142,161,47,54,177,254,254,
236,123,205,227,58,177,219,237,86,3,152,250,34,26,80,37,132,96,179,217,80,150,229,200,96,155,205,6,173,245,96,190,
49,38,48,177,6,196,162,9,189,15,178,44,27,140,123,96,109,219,142,36,136,95,90,107,98,214,3,177,9,211,240,99,
190,8,77,197,161,162,52,11,32,149,96,238,37,3,79,18,164,0,60,232,135,135,135,17,107,171,1,132,135,82,6,157,
227,240,0,119,187,221,8,160,63,5,167,167,167,65,138,163,62,201,226,5,189,235,167,88,232,251,30,173,245,36,56,95,
71,252,247,229,82,164,167,160,146,82,254,234,251,254,213,217,217,89,24,156,211,185,40,138,197,197,211,242,155,231,249,14,
120,7,252,4,246,41,128,10,120,115,127,127,255,249,252,252,252,19,80,46,174,190,50,242,60,167,105,26,132,16,127,238,
238,238,190,0,239,1,5,124,7,92,156,90,14,188,5,94,3,91,192,60,79,252,23,241,135,167,100,107,224,7,240,13,
248,13,19,127,78,159,55,46,158,1,173,43,103,135,195,1,45,79,180,239,129,96,140,191,182,58,238,12,241,249,173,246,
0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t home[1774] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,6,165,73,68,65,84,88,133,213,151,105,108,84,
215,21,199,127,119,121,111,54,143,199,96,199,118,48,120,12,184,200,20,8,187,218,34,71,8,186,56,106,80,165,162,42,
180,105,138,132,148,168,74,34,65,84,5,169,223,218,74,249,148,79,17,81,149,46,18,4,186,80,86,41,105,43,149,6,
21,53,4,137,184,13,132,8,154,64,98,226,98,48,216,96,60,216,99,207,246,238,189,253,48,11,94,134,85,202,135,30,
233,74,119,222,61,239,156,255,57,231,127,206,220,7,255,207,178,79,202,151,255,32,196,173,189,48,231,97,109,136,135,121,
105,63,248,40,181,167,177,161,225,137,150,154,154,218,211,189,189,253,129,49,223,120,26,62,249,194,1,236,129,198,136,214,
239,44,152,55,111,65,219,172,89,225,220,208,16,35,233,52,167,251,250,6,242,65,240,157,31,66,247,131,216,147,15,162,
252,59,88,17,11,133,78,175,90,190,124,113,91,91,91,24,41,113,64,196,247,89,222,218,218,20,246,188,191,254,17,190,
249,133,0,216,175,212,143,106,107,106,254,222,217,217,57,171,190,177,81,34,37,40,5,66,224,128,144,231,177,44,153,108,
8,249,254,159,246,41,245,131,251,181,123,207,18,252,28,228,66,165,94,111,104,106,122,122,197,170,85,117,74,74,48,6,
172,197,166,82,216,225,97,50,198,96,0,7,4,214,114,238,242,229,155,153,92,238,23,155,172,221,113,47,251,234,174,81,
67,226,17,173,143,182,119,116,60,177,100,245,234,90,169,74,234,66,96,135,134,112,195,195,20,140,33,164,20,198,57,140,
115,32,4,245,181,181,145,145,92,238,171,223,181,182,246,128,181,255,120,168,12,236,134,5,49,207,59,178,108,205,154,217,
77,173,173,26,107,193,24,92,16,96,47,93,34,184,117,139,51,195,67,92,29,188,193,202,100,146,230,104,148,113,107,201,
58,135,3,44,112,113,96,96,100,52,157,62,248,61,99,158,21,197,4,77,147,170,28,216,171,212,147,181,53,53,239,117,
110,216,208,214,212,222,174,81,10,164,196,25,131,189,120,145,241,155,55,121,127,104,144,196,75,219,88,117,234,20,255,77,
196,232,73,143,18,149,146,112,137,19,56,199,220,198,198,218,153,137,196,83,7,180,126,235,24,232,251,202,192,1,173,127,
22,111,104,216,246,149,174,174,25,94,36,82,140,218,90,220,200,8,230,252,121,110,142,142,114,46,147,38,249,203,55,136,
44,121,12,99,12,194,90,174,253,244,101,212,169,51,44,138,215,146,3,70,140,193,81,12,123,32,149,202,12,14,15,127,
48,28,4,93,63,134,241,170,0,118,65,56,166,212,161,57,11,22,60,190,120,253,250,184,152,72,182,129,1,204,133,11,
92,74,167,185,18,9,51,255,205,221,200,250,122,130,32,64,74,137,148,18,107,45,67,191,122,131,244,222,189,44,79,212,
97,132,32,101,12,22,112,206,145,74,167,115,253,55,110,156,79,7,193,218,45,144,42,251,85,0,191,135,217,81,173,79,
44,237,236,92,249,165,181,107,163,229,246,66,8,108,111,47,193,133,11,156,75,167,73,127,121,33,237,187,247,32,227,113,
140,49,68,34,17,102,206,156,73,44,22,195,24,67,120,197,74,188,214,57,124,124,228,8,205,218,35,170,53,89,231,176,
128,239,251,58,234,251,245,217,241,241,167,190,237,220,129,183,32,93,201,192,62,41,251,31,223,184,177,57,49,127,126,49,
35,214,226,130,0,243,209,71,100,251,250,248,112,116,148,25,155,55,211,244,194,11,24,99,176,214,18,139,197,8,135,195,
147,202,151,201,100,200,100,50,100,207,158,165,231,249,231,89,18,10,81,19,10,113,221,24,10,37,114,230,179,89,219,123,
245,234,21,107,204,186,239,67,143,4,208,74,229,18,237,237,2,165,64,41,156,49,4,221,221,140,124,254,57,221,35,35,
204,126,245,85,154,95,124,17,231,28,74,41,18,137,4,190,239,99,173,173,44,99,12,190,239,83,83,83,67,108,233,82,
58,14,29,226,172,148,220,200,100,104,212,26,191,68,78,29,10,201,185,45,45,115,164,82,255,156,220,5,165,201,230,198,
198,8,222,125,151,107,151,47,243,161,181,44,58,120,144,196,186,117,56,231,208,90,19,141,70,75,73,154,236,188,188,23,
66,16,137,68,8,183,180,176,248,237,183,185,212,216,72,239,216,24,141,90,19,41,129,144,158,135,86,202,77,107,67,55,
48,64,225,216,49,46,12,14,114,233,209,71,89,126,228,8,225,121,243,0,240,60,15,207,243,38,57,158,234,124,226,242,
60,15,47,145,96,225,254,253,140,173,94,205,127,70,71,121,68,41,226,82,34,197,237,230,171,0,48,159,125,70,238,248,
113,78,246,247,19,172,95,207,99,135,15,35,227,113,156,115,72,41,17,66,220,151,243,169,217,144,158,199,188,215,94,35,
252,204,51,188,63,52,196,12,41,153,33,111,199,173,1,2,99,194,215,78,158,228,124,42,53,58,190,105,83,108,197,43,
175,72,107,45,184,226,240,114,206,225,220,228,65,86,254,45,132,64,107,141,16,98,154,78,89,207,24,67,203,214,173,28,
239,233,41,4,71,143,6,29,241,120,36,31,4,53,21,0,57,107,215,255,187,175,239,196,220,45,91,126,114,184,174,110,
215,215,149,34,8,2,142,30,125,135,177,241,177,138,163,169,18,141,196,232,234,234,98,199,142,215,201,231,115,211,206,1,
60,63,196,75,219,182,146,207,231,25,156,63,63,104,59,113,226,91,31,244,247,255,165,96,237,154,10,128,205,240,49,206,
205,100,231,78,182,111,223,190,171,194,234,144,207,167,61,231,39,25,20,66,84,192,44,236,88,132,115,142,124,62,135,73,
62,137,239,41,60,45,49,198,146,47,88,114,133,0,174,252,13,231,28,133,66,1,165,84,102,99,127,255,123,64,221,52,
14,76,148,114,13,91,231,180,162,181,174,16,208,247,253,202,222,243,60,146,173,73,172,181,37,96,32,5,40,33,138,36,
155,144,176,114,25,172,181,211,106,84,245,15,194,57,135,181,150,100,50,137,214,85,85,0,104,104,104,168,0,24,207,6,
228,242,134,241,92,192,173,177,28,35,99,57,50,57,195,215,162,197,128,74,99,59,255,64,0,148,214,149,72,68,105,35,
25,71,139,94,242,174,3,4,21,0,255,250,228,90,117,148,81,38,118,69,97,234,241,93,75,80,118,44,40,165,84,128,
39,62,101,195,154,63,163,196,40,80,157,249,213,196,24,131,115,46,152,250,252,142,25,48,198,128,115,147,217,47,32,207,
50,14,28,95,92,41,77,113,232,248,172,171,59,83,213,177,246,138,35,187,80,40,32,165,204,62,16,0,237,121,20,131,
159,220,130,158,231,21,241,8,200,102,179,60,247,220,179,85,219,180,108,43,151,203,149,203,122,207,12,132,202,81,89,107,
145,66,86,53,60,17,80,62,159,39,159,191,205,173,106,37,145,82,82,40,20,8,130,192,2,13,20,239,3,193,84,0,
62,80,47,132,8,178,217,172,142,199,227,147,122,254,78,18,143,199,239,122,94,6,116,253,250,117,10,133,130,1,154,75,
126,7,1,59,17,128,6,252,84,42,245,230,206,157,59,183,56,231,238,122,99,6,248,205,175,127,123,47,149,138,8,33,
178,221,221,221,123,129,48,197,96,5,76,190,19,10,160,190,180,106,75,74,119,30,2,15,38,121,138,183,175,12,112,11,
184,12,100,167,2,40,139,7,68,74,72,31,234,227,181,138,56,160,80,114,154,101,194,21,253,127,69,252,95,225,237,227,
107,122,0,0,0,0,73,69,78,68,174,66,96,130,
};
const uint8_t up[1193] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,4,96,73,68,65,84,88,133,237,150,91,108,21,
85,20,134,191,53,123,79,79,123,106,67,209,88,229,22,16,68,169,36,74,90,77,161,165,4,49,84,226,37,165,68,76,
68,209,68,162,49,193,75,144,2,79,18,12,198,24,19,140,36,198,7,194,19,193,224,131,81,12,225,1,19,12,81,210,
234,131,196,11,105,20,17,164,180,180,182,5,122,161,237,233,57,51,123,249,48,231,148,114,122,7,53,62,176,146,149,61,
151,61,235,255,214,218,107,207,12,220,180,235,180,133,59,200,41,223,98,171,110,52,142,119,189,15,22,246,153,61,190,228,
28,41,175,245,95,255,207,1,42,54,251,175,204,188,125,254,218,87,159,126,155,91,242,10,222,45,175,181,43,254,51,128,
138,45,182,114,74,193,173,187,170,151,61,27,239,13,46,178,250,225,231,242,173,245,63,95,178,41,118,247,191,14,176,236,
77,102,249,38,231,208,83,143,108,136,95,184,114,138,227,103,62,35,48,9,170,150,172,46,240,108,240,85,233,54,166,76,
22,192,76,116,98,233,14,226,38,180,117,107,150,191,56,45,22,183,210,208,242,45,78,67,90,187,255,96,193,244,135,196,
154,88,126,91,123,83,249,226,233,110,127,67,3,58,209,184,19,173,128,228,246,218,3,203,23,61,49,103,214,157,115,188,
134,214,227,128,32,34,56,13,249,254,220,33,22,45,88,156,115,215,180,249,101,205,115,236,174,137,138,195,4,43,80,81,
107,223,42,158,93,242,194,202,178,53,185,39,154,142,48,144,234,195,105,152,246,128,100,208,79,71,111,35,75,239,123,210,
63,219,116,234,254,59,74,18,77,141,245,250,211,63,2,80,94,107,30,47,154,58,99,247,51,85,27,227,191,182,213,211,
157,104,31,20,15,53,24,60,238,29,232,164,63,213,67,217,130,149,254,111,231,78,86,205,92,204,209,198,58,215,60,94,
252,49,151,160,98,107,236,222,88,44,254,233,250,85,155,226,45,61,167,233,236,255,107,204,96,127,94,250,133,214,222,211,
60,186,180,38,95,61,14,151,109,101,230,117,3,148,110,99,138,186,224,232,243,171,222,200,15,164,143,11,93,191,95,115,
95,7,251,236,106,191,169,58,126,110,254,26,155,11,149,37,43,11,125,181,71,74,119,16,159,52,192,218,181,152,152,179,
95,86,87,174,47,42,154,58,93,78,183,159,64,85,35,81,81,196,3,99,4,207,130,103,5,49,74,64,2,149,16,69,
169,63,123,144,217,51,230,154,226,185,15,204,203,237,181,7,0,25,13,96,196,30,40,124,204,126,248,96,241,178,234,21,
37,53,177,147,173,223,144,12,163,224,78,2,144,16,53,33,206,115,168,164,72,184,110,18,97,15,120,14,207,19,196,3,
167,1,45,93,103,169,92,88,109,91,219,155,103,221,182,232,138,223,88,231,142,141,164,53,140,108,105,173,89,55,163,104,
222,222,141,53,59,243,16,33,21,246,227,8,49,158,225,216,153,125,4,12,16,184,36,61,169,14,186,19,109,56,13,81,
64,29,168,42,53,197,219,80,141,142,213,129,11,149,253,135,63,238,239,25,232,92,87,255,126,120,48,91,207,102,95,112,
42,159,180,116,156,103,251,222,13,17,161,224,84,241,182,191,244,17,98,20,65,233,74,94,160,55,184,140,248,96,240,96,
80,80,240,140,176,123,223,59,136,146,194,35,36,130,203,19,228,139,145,18,30,6,80,183,43,16,8,6,207,75,95,198,
143,21,216,36,158,130,113,92,236,63,71,66,59,177,57,2,146,142,151,22,119,78,17,3,162,132,97,104,239,177,126,162,
11,64,12,132,3,36,70,90,130,97,0,217,246,195,30,82,229,155,1,148,75,3,231,73,104,23,198,23,36,189,222,81,
134,130,58,69,156,224,121,2,30,97,202,38,46,127,247,30,93,227,197,31,23,32,99,41,77,208,19,182,97,108,84,102,
207,128,164,43,160,170,184,80,144,80,17,111,212,134,191,49,128,190,160,19,207,128,103,36,130,176,130,151,174,128,115,130,
72,244,62,144,201,233,79,28,32,233,250,240,109,12,188,212,85,8,19,169,73,168,81,35,58,29,99,199,223,32,128,162,
8,130,10,145,136,48,8,224,50,194,50,105,253,9,1,216,52,65,122,127,71,153,106,40,132,184,232,86,152,190,166,87,
95,204,29,63,18,7,6,136,182,84,48,82,224,177,0,12,224,15,113,172,228,80,53,251,53,60,143,104,7,200,181,77,
152,1,115,14,80,228,74,51,133,128,3,82,89,30,142,7,96,128,156,44,231,131,189,59,71,45,209,8,230,39,218,177,
64,94,90,195,16,125,119,132,168,42,46,51,113,164,37,19,32,150,206,60,3,224,15,25,51,62,52,176,75,103,22,100,
101,155,28,50,38,211,226,201,108,177,209,204,203,130,176,67,68,51,194,67,191,166,110,8,200,80,152,140,104,0,195,255,
21,39,211,180,153,18,102,143,164,3,103,60,3,146,57,191,105,255,111,251,27,250,226,227,129,148,124,126,213,0,0,0,
0,73,69,78,68,174,66,96,130,
244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,5,137,73,68,65,84,88,133,237,150,91,108,20,
231,21,199,127,231,155,155,151,181,124,89,3,181,113,193,183,13,16,81,82,21,225,52,50,1,132,91,53,20,212,132,155,
212,84,149,18,161,40,82,213,151,72,68,81,108,212,74,121,168,122,81,165,190,24,171,125,141,218,226,66,171,66,91,37,
65,145,82,225,2,9,6,148,132,40,73,9,55,219,4,112,146,58,49,23,239,125,102,190,62,204,236,120,236,176,182,1,
169,79,29,233,232,236,203,156,255,239,252,207,249,190,29,248,255,115,31,79,182,135,157,153,94,116,102,47,91,239,181,134,
186,31,113,173,216,159,173,249,10,90,243,215,76,47,91,254,103,0,217,30,118,106,225,143,183,219,215,219,250,225,103,201,
180,173,179,53,28,186,23,136,187,6,8,58,151,253,147,233,13,142,151,106,97,226,76,63,238,194,54,50,237,143,222,19,
132,220,173,56,134,57,144,95,243,3,43,111,8,147,31,253,3,180,7,98,80,189,226,123,152,159,95,102,193,197,227,69,
129,237,201,95,240,234,124,106,206,219,129,108,47,59,48,204,1,111,211,139,150,145,254,22,217,11,175,160,68,163,148,66,
137,38,123,225,21,252,133,105,114,233,245,129,19,123,249,238,124,234,206,203,129,108,47,59,180,48,224,111,124,193,150,150,
46,138,19,23,64,107,4,184,253,225,1,220,155,163,160,65,139,34,153,222,140,57,62,76,213,197,227,69,17,182,37,127,
206,107,179,213,158,211,129,64,92,6,178,15,108,180,189,134,86,74,19,23,17,64,68,16,17,204,68,93,224,130,161,80,
2,185,203,175,227,54,180,145,79,175,179,181,230,240,92,78,204,234,64,36,158,126,212,246,83,203,64,187,56,141,107,65,
160,52,126,142,252,245,147,248,185,207,167,94,208,58,72,8,137,214,110,140,241,17,170,46,189,57,171,19,21,29,200,246,
176,93,139,12,228,210,235,108,63,245,85,242,163,255,68,187,249,168,115,63,51,6,133,137,160,251,40,12,68,41,148,8,
249,43,71,241,26,150,145,111,127,196,22,164,226,78,220,17,32,219,195,118,95,228,79,217,116,151,237,213,53,147,191,50,
136,8,129,128,8,34,10,17,65,41,99,70,168,169,12,20,174,30,195,91,216,66,182,173,211,169,4,241,37,128,178,120,
174,227,17,219,175,91,66,225,234,49,20,160,68,161,172,5,80,158,125,205,82,204,228,226,105,226,18,101,21,65,20,175,
158,192,75,45,37,219,182,214,17,228,208,100,15,155,43,2,100,122,217,22,136,63,108,251,117,77,20,174,190,137,8,72,
185,168,83,27,117,111,47,92,73,242,107,79,97,47,94,61,189,243,16,72,194,113,136,64,113,108,8,175,174,153,108,235,
26,71,41,57,28,135,136,0,244,75,40,224,80,177,190,209,102,201,215,41,140,157,14,108,151,169,249,154,53,205,136,72,
232,66,0,34,165,201,169,217,71,89,97,88,85,88,245,29,40,195,10,156,248,236,29,212,3,143,81,168,89,236,136,76,
45,100,4,32,47,225,227,179,205,158,248,164,40,215,222,193,105,90,19,21,20,81,24,201,69,40,59,137,136,160,115,227,
228,222,221,71,238,221,126,252,204,245,72,220,176,18,209,8,140,154,165,44,88,190,29,179,182,5,49,76,18,45,221,56,
185,12,206,237,255,20,181,158,218,133,105,35,72,254,138,191,9,250,251,137,225,51,69,243,198,117,236,198,111,32,202,68,
148,194,94,180,122,234,4,220,188,140,200,116,203,205,234,38,18,15,61,131,149,90,142,89,221,136,149,90,142,8,36,58,
182,80,219,245,83,18,84,33,39,250,139,190,231,63,81,253,75,142,68,141,223,233,20,100,122,217,134,200,129,98,251,90,
219,79,53,225,223,184,68,98,245,110,148,225,128,8,197,243,127,70,231,198,131,113,68,173,88,56,171,118,163,37,236,73,
107,52,160,18,13,232,145,33,244,241,254,146,246,220,199,227,226,21,1,166,65,164,59,109,107,197,86,84,162,1,9,174,
64,40,78,226,126,252,6,160,49,106,59,240,198,223,195,88,210,133,170,237,8,133,53,104,144,170,122,244,232,16,254,177,
59,139,207,10,80,134,208,168,131,170,251,121,75,45,93,131,206,127,17,118,45,248,55,47,66,225,38,102,227,90,180,214,
81,169,224,183,6,39,20,255,215,190,138,226,115,2,64,120,47,24,230,65,99,211,30,83,39,171,241,174,31,199,168,107,
71,223,56,15,94,1,107,229,15,65,153,83,215,176,214,96,215,161,71,79,226,205,33,62,47,128,50,132,54,140,3,254,
242,78,75,234,27,17,237,66,241,22,214,146,46,164,174,131,80,25,173,65,236,26,252,209,33,188,193,190,146,214,238,19,
115,253,27,206,247,131,196,248,108,15,59,146,85,242,7,86,126,211,182,59,127,140,246,242,168,240,78,40,3,96,85,227,
141,156,194,27,236,43,77,228,220,93,205,191,225,53,192,3,252,138,133,103,17,85,128,13,84,1,206,175,223,98,244,201,
85,92,72,101,174,109,241,201,24,102,115,39,248,110,112,52,145,72,188,52,216,231,190,255,169,251,244,131,253,28,5,204,
80,163,124,220,191,4,82,9,192,2,156,153,241,219,51,92,249,118,27,151,155,115,195,223,145,69,29,134,170,95,134,248,
46,88,73,252,145,33,74,131,125,238,209,97,247,71,221,47,115,44,38,94,6,80,4,142,135,91,90,25,192,8,1,236,
88,68,16,47,159,229,90,103,147,30,110,187,117,170,91,26,90,149,212,183,226,143,156,164,56,216,231,30,254,183,187,103,
215,65,222,10,197,227,162,241,81,107,130,177,204,10,96,134,16,102,8,80,6,114,0,231,192,7,140,173,72,249,87,86,
76,158,218,160,111,127,170,74,111,255,197,251,253,89,247,39,207,252,157,211,49,209,184,160,31,134,23,203,21,1,252,24,
189,17,203,101,48,3,176,14,159,99,172,165,198,191,182,218,26,89,255,187,51,254,207,158,59,194,233,25,66,238,140,40,
197,34,26,193,108,167,160,188,7,118,44,199,195,138,1,150,187,44,11,20,103,68,33,150,167,45,226,124,142,97,121,28,
54,211,71,83,22,143,47,150,23,235,62,14,51,173,235,187,5,184,211,59,113,241,114,141,153,179,158,215,243,95,119,198,
63,107,9,247,71,127,0,0,0,0,73,69,78,68,174,66,96,130,
};
};

7
higan/target-ethos/resource/resource.hpp
View File

@ -1,7 +1,6 @@
namespace resource {
extern const uint8_t cabinet[667];
extern const uint8_t home[606];
extern const uint8_t up[652];
extern const uint8_t folder[1176];
extern const uint8_t file[844];
extern const uint8_t home[1774];
extern const uint8_t up[1193];
extern const uint8_t game[1490];
};

BIN
higan/target-ethos/resource/up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 652 B

31
higan/target-ethos/utility/utility.cpp
View File

@ -28,7 +28,6 @@ void Utility::loadMedia(string pathname) {
//determine type by comparing extension against all emulation cores
for(auto &emulator : application->emulator) {
for(auto &media : emulator->media) {
if(!media.load.empty()) continue;
if(type != media.type) continue;
return utility->loadMedia(emulator, media, {pathname, "/"});
}
@ -39,30 +38,26 @@ void Utility::loadMedia(string pathname) {
//load menu option selected
void Utility::loadMedia(Emulator::Interface *emulator, Emulator::Interface::Media &media) {
string pathname;
if(!media.load.empty()) pathname = application->path({media.load, "/"});
if(!directory::exists(pathname)) pathname = browser->select("Load Media", media.type);
string pathname = browser->select({"Load ", media.name}, media.type);
if(!directory::exists(pathname)) return;
if(!file::exists({pathname, "manifest.bml"})) return;
return loadMedia(emulator, media, pathname);
}
//load menu cartridge selected or command-line load
//load base cartridge
void Utility::loadMedia(Emulator::Interface *emulator, Emulator::Interface::Media &media, const string &pathname) {
unload();
setInterface(emulator);
path(0) = application->path({media.name, ".sys/"});
path(media.id) = pathname;
if(media.load.empty()) this->pathname.append(pathname);
this->pathname.append(pathname);
string manifest;
manifest.readfile({pathname, "manifest.bml"});
system().load(media.id, manifest);
system().load(media.id, string::read({pathname, "manifest.bml"}));
system().power();
if(this->pathname.size() == 0) this->pathname.append(pathname);
presentation->setSystemName(media.name);
load(Markup::Document(manifest)["information/title"].text());
load();
}
//request from emulation core to load non-volatile media folder
@ -72,9 +67,7 @@ void Utility::loadRequest(unsigned id, const string &name, const string &type) {
path(id) = pathname;
this->pathname.append(pathname);
string manifest;
manifest.readfile({pathname, "manifest.bml"});
system().load(id, manifest);
system().load(id, string::read({pathname, "manifest.bml"}));
}
//request from emulation core to load non-volatile media file
@ -107,16 +100,8 @@ void Utility::reset() {
system().reset();
}
void Utility::load(string title) {
if(title.empty()) {
for(auto &path : pathname) {
string name = path;
name.rtrim<1>("/");
title.append(notdir(nall::basename(name)), " + ");
}
title.rtrim<1>(" + ");
}
presentation->setTitle(title);
void Utility::load() {
presentation->setTitle(system().title());
cheatEditor->load({pathname[0], "cheats.bml"});
stateManager->load({pathname[0], "bsnes/states.bsa"}, 1);

2
higan/target-ethos/utility/utility.hpp
View File

@ -12,7 +12,7 @@ struct Utility {
void connect(unsigned port, unsigned device);
void power();
void reset();
void load(string title = "");
void load();
void unload();
void saveState(unsigned slot);

86
higan/target-laevateinn/Makefile
View File

@ -1,86 +0,0 @@
options += debugger
processors := arm gsu hg51b lr35902 r65816 spc700 upd96050
include processor/Makefile
include $(sfc)/Makefile
include $(gb)/Makefile
name := laevateinn
ui_objects := ui-main ui-settings ui-interface ui-debugger ui-tracer ui-window
ui_objects += ui-console ui-video ui-cpu ui-smp ui-memory ui-breakpoint ui-properties ui-vram
ui_objects += phoenix ruby
ui_objects += $(if $(call streq,$(platform),win),resource)
# platform
ifeq ($(platform),x)
ruby := audio.alsa
else ifeq ($(platform),osx)
ruby := audio.openal
else ifeq ($(platform),win)
ruby := audio.xaudio2
endif
# phoenix
include phoenix/Makefile
link += $(phoenixlink)
# ruby
include ruby/Makefile
link += $(rubylink)
# rules
objects := $(ui_objects) $(objects)
objects := $(patsubst %,obj/%.o,$(objects))
obj/ui-main.o: $(ui)/main.cpp $(call rwildcard,$(ui)/)
obj/ui-settings.o: $(ui)/settings/settings.cpp $(call rwildcard,$(ui)/*)
obj/ui-interface.o: $(ui)/interface/interface.cpp $(call rwildcard,$(ui)/*)
obj/ui-debugger.o: $(ui)/debugger/debugger.cpp $(call rwildcard,$(ui)/*)
obj/ui-tracer.o: $(ui)/tracer/tracer.cpp $(call rwildcard,$(ui)/*)
obj/ui-window.o: $(ui)/window/window.cpp $(call rwildcard,$(ui)/*)
obj/ui-console.o: $(ui)/console/console.cpp $(call rwildcard,$(ui)/*)
obj/ui-cpu.o: $(ui)/cpu/cpu.cpp $(call rwildcard,$(ui)/*)
obj/ui-smp.o: $(ui)/smp/smp.cpp $(call rwildcard,$(ui)/*)
obj/ui-video.o: $(ui)/video/video.cpp $(call rwildcard,$(ui)/*)
obj/ui-memory.o: $(ui)/memory/memory.cpp $(call rwildcard,$(ui)/*)
obj/ui-breakpoint.o: $(ui)/breakpoint/breakpoint.cpp $(call rwildcard,$(ui)/*)
obj/ui-properties.o: $(ui)/properties/properties.cpp $(call rwildcard,$(ui)/*)
obj/ui-vram.o: $(ui)/vram/vram.cpp $(call rwildcard,$(ui)/*)
obj/ruby.o: ruby/ruby.cpp $(call rwildcard,ruby/*)
$(call compile,$(rubyflags))
obj/phoenix.o: phoenix/phoenix.cpp $(call rwildcard,phoenix/*)
$(call compile,$(phoenixflags))
obj/resource.o: $(ui)/resource.rc
# windres --target=pe-i386 $(ui)/resource.rc obj/resource.o
windres $(ui)/resource.rc obj/resource.o
# targets
build: $(objects)
ifeq ($(platform),osx)
test -d ../$(name).app || mkdir -p ../$(name).app/Contents/MacOS
$(strip $(cpp) -o ../$(name).app/Contents/MacOS/$(name) $(objects) $(link))
else
$(strip $(cpp) -o out/$(name) $(objects) $(link))
endif
install:
ifeq ($(USER),root)
@echo Please do not run make install as root.
@echo The installer needs to know your home directory to install important files.
else ifeq ($(platform),x)
sudo install -D -m 755 out/$(name) $(DESTDIR)$(prefix)/bin/$(name)
mkdir -p ~/.config/$(name)
cp -R profile/* ~/.config/$(name)
cp data/cheats.xml ~/.config/$(name)/cheats.xml
chmod -R 777 ~/.config/$(name)
endif
uninstall:
ifeq ($(platform),x)
sudo rm $(DESTDIR)$(prefix)/bin/$(name)
endif

53
higan/target-laevateinn/base.hpp
View File

@ -1,53 +0,0 @@
#if !defined(PROFILE_ACCURACY)
#error "debugger is only compatible with accuracy profile"
#endif
#include <sfc/sfc.hpp>
namespace SFC = SuperFamicom;
#include <nall/config.hpp>
#include <nall/directory.hpp>
#include <nall/dsp.hpp>
#include <nall/file.hpp>
#include <nall/filemap.hpp>
#include <nall/stream/file.hpp>
#include <nall/stream/vector.hpp>
#include <nall/snes/cartridge.hpp>
using namespace nall;
#include <phoenix/phoenix.hpp>
using namespace phoenix;
#include <ruby/ruby.hpp>
using namespace ruby;
#include "settings/settings.hpp"
#include "interface/interface.hpp"
#include "debugger/debugger.hpp"
#include "tracer/tracer.hpp"
#include "window/window.hpp"
#include "console/console.hpp"
#include "video/video.hpp"
#include "cpu/cpu.hpp"
#include "smp/smp.hpp"
#include "memory/memory.hpp"
#include "breakpoint/breakpoint.hpp"
#include "properties/properties.hpp"
#include "vram/vram.hpp"
extern uint8_t laevateinnLogo[121905];
struct Application {
bool quit;
string basepath;
string userpath;
string proportionalFont;
string proportionalFontBold;
string monospaceFont;
Application(int argc, char **argv);
~Application();
};
extern Application *application;

238
higan/target-laevateinn/breakpoint/breakpoint.cpp
View File

@ -1,238 +0,0 @@
#include "../base.hpp"
BreakpointEditor *breakpointEditor = nullptr;
BreakpointEntry::BreakpointEntry() {
static unsigned id = 1;
enable.setText({ "#", id++ });
addr.setFont(application->monospaceFont);
data.setFont(application->monospaceFont);
type.append("Read", "Write", "Exec");
source.append("CPU", "SMP", "VRAM", "OAM", "CGRAM");
append(enable, {0, 0}, 5);
append(addr, {50, 0}, 5);
append(data, {25, 0}, 5);
append(type, {0, 0}, 5);
append(source, {0, 0});
enable.onToggle = [&] {
bool flag = !enable.checked();
addr.setEnabled(flag);
data.setEnabled(flag);
type.setEnabled(flag);
source.setEnabled(flag);
breakpointEditor->synchronize();
};
}
BreakpointEditor::BreakpointEditor() {
setTitle("Breakpoint Editor");
layout.setMargin(5);
for(auto &bp : breakpointEntry) layout.append(bp, {0, 0}, 5);
append(layout);
setGeometry({128, 128, layout.minimumGeometry().width, layout.minimumGeometry().height - 5});
synchronize();
windowManager->append(this, "BreakpointEditor");
}
//enable checkbox toggled on one of the five BreakpointEntry items:
//cache settings to decrease testing overhead whilst debugging
void BreakpointEditor::synchronize() {
breakpoint.reset();
unsigned id = 0;
for(auto &entry : breakpointEntry) {
id++;
if(entry.enable.checked() == false) continue;
Breakpoint bp;
bp.id = id;
bp.compare = !entry.data.text().empty();
bp.addr = hex(entry.addr.text());
bp.data = hex(entry.data.text());
bp.type = entry.type.selection();
bp.source = entry.source.selection();
breakpoint.append(bp);
}
breakpointReadCPU.reset();
breakpointWriteCPU.reset();
breakpointExecCPU.reset();
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Read && bp.source == Breakpoint::CPU) breakpointReadCPU.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Write && bp.source == Breakpoint::CPU) breakpointWriteCPU.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Exec && bp.source == Breakpoint::CPU) breakpointExecCPU.append(bp);
for(auto &bp : breakpointReadCPU) bp.addr = cpuDebugger->mirror(bp.addr);
for(auto &bp : breakpointWriteCPU) bp.addr = cpuDebugger->mirror(bp.addr);
for(auto &bp : breakpointExecCPU) bp.addr = cpuDebugger->mirror(bp.addr);
breakpointReadSMP.reset();
breakpointWriteSMP.reset();
breakpointExecSMP.reset();
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Read && bp.source == Breakpoint::SMP) breakpointReadSMP.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Write && bp.source == Breakpoint::SMP) breakpointWriteSMP.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Exec && bp.source == Breakpoint::SMP) breakpointExecSMP.append(bp);
breakpointReadVRAM.reset();
breakpointWriteVRAM.reset();
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Read && bp.source == Breakpoint::VRAM) breakpointReadVRAM.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Write && bp.source == Breakpoint::VRAM) breakpointWriteVRAM.append(bp);
breakpointReadOAM.reset();
breakpointWriteOAM.reset();
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Read && bp.source == Breakpoint::OAM) breakpointReadOAM.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Write && bp.source == Breakpoint::OAM) breakpointWriteOAM.append(bp);
breakpointReadCGRAM.reset();
breakpointWriteCGRAM.reset();
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Read && bp.source == Breakpoint::CGRAM) breakpointReadCGRAM.append(bp);
for(auto &bp : breakpoint) if(bp.type == Breakpoint::Write && bp.source == Breakpoint::CGRAM) breakpointWriteCGRAM.append(bp);
}
//S-CPU
//=====
bool BreakpointEditor::testReadCPU(uint24 addr) {
addr = cpuDebugger->mirror(addr);
for(auto &bp : breakpointReadCPU) {
if(bp.addr == addr) {
if(bp.compare && bp.data != cpuDebugger->read(addr)) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testWriteCPU(uint24 addr, uint8 data) {
addr = cpuDebugger->mirror(addr);
for(auto &bp : breakpointWriteCPU) {
if(bp.addr == addr) {
if(bp.compare && bp.data != data) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testExecCPU(uint24 addr) {
addr = cpuDebugger->mirror(addr);
for(auto &bp : breakpointExecCPU) {
if(bp.addr == addr) {
debugger->print("Breapoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
//S-SMP
//=====
bool BreakpointEditor::testReadSMP(uint16 addr) {
for(auto &bp : breakpointReadSMP) {
if(bp.addr == addr) {
if(bp.compare && bp.data != smpDebugger->read(addr)) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testWriteSMP(uint16 addr, uint8 data) {
for(auto &bp : breakpointWriteSMP) {
if(bp.addr == addr) {
if(bp.compare && bp.data != data) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testExecSMP(uint16 addr) {
for(auto &bp : breakpointExecSMP) {
if(bp.addr == addr) {
debugger->print("Breapoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
//S-PPU
//=====
bool BreakpointEditor::testReadVRAM(uint16 addr) {
for(auto &bp : breakpointReadVRAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != SFC::ppu.vram[addr]) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testWriteVRAM(uint16 addr, uint8 data) {
for(auto &bp : breakpointWriteVRAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != data) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testReadOAM(uint16 addr) {
for(auto &bp : breakpointReadOAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != SFC::ppu.oam[addr]) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testWriteOAM(uint16 addr, uint8 data) {
for(auto &bp : breakpointWriteOAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != data) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testReadCGRAM(uint16 addr) {
for(auto &bp : breakpointReadCGRAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != SFC::ppu.cgram[addr]) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}
bool BreakpointEditor::testWriteCGRAM(uint16 addr, uint8 data) {
for(auto &bp : breakpointWriteCGRAM) {
if(bp.addr == addr) {
if(bp.compare && bp.data != data) continue;
debugger->print("Breakpoint #", bp.id, " hit\n");
return true;
}
}
return false;
}

60
higan/target-laevateinn/breakpoint/breakpoint.hpp
View File

@ -1,60 +0,0 @@
struct BreakpointEntry : HorizontalLayout {
CheckBox enable;
LineEdit addr;
LineEdit data;
ComboBox type;
ComboBox source;
BreakpointEntry();
};
struct BreakpointEditor : Window {
VerticalLayout layout;
BreakpointEntry breakpointEntry[8];
struct Breakpoint {
enum : unsigned { Read, Write, Exec };
enum : unsigned { CPU, SMP, VRAM, OAM, CGRAM };
unsigned id;
bool compare;
unsigned addr;
unsigned data;
unsigned type;
unsigned source;
};
vector<Breakpoint> breakpoint;
vector<Breakpoint> breakpointReadCPU;
vector<Breakpoint> breakpointWriteCPU;
vector<Breakpoint> breakpointExecCPU;
vector<Breakpoint> breakpointReadSMP;
vector<Breakpoint> breakpointWriteSMP;
vector<Breakpoint> breakpointExecSMP;
vector<Breakpoint> breakpointReadVRAM;
vector<Breakpoint> breakpointWriteVRAM;
vector<Breakpoint> breakpointReadOAM;
vector<Breakpoint> breakpointWriteOAM;
vector<Breakpoint> breakpointReadCGRAM;
vector<Breakpoint> breakpointWriteCGRAM;
void synchronize();
bool testReadCPU(uint24 addr);
bool testWriteCPU(uint24 addr, uint8 data);
bool testExecCPU(uint24 addr);
bool testReadSMP(uint16 addr);
bool testWriteSMP(uint16 addr, uint8 data);
bool testExecSMP(uint16 addr);
bool testReadVRAM(uint16 addr);
bool testWriteVRAM(uint16 addr, uint8 data);
bool testReadOAM(uint16 addr);
bool testWriteOAM(uint16 addr, uint8 data);
bool testReadCGRAM(uint16 addr);
bool testWriteCGRAM(uint16 addr, uint8 data);
BreakpointEditor();
};
extern BreakpointEditor *breakpointEditor;

32
higan/target-laevateinn/console/about.cpp
View File

@ -1,32 +0,0 @@
#include <data/laevateinn.hpp>
AboutWindow *aboutWindow = nullptr;
AboutWindow::AboutWindow() {
setTitle("About Laevateinn");
//setResizable(false);
layout.setMargin(10);
layout.setAlignment(0.5);
canvas.setSize({288, 360});
title.setFont("Sans, 16, Bold");
title.setText("Laevateinn");
version.setFont("Sans, 8, Bold");
version.setText({"bsnes/debugger v", Emulator::Version});
website.setFont("Sans, 8, Bold");
website.setText("http://byuu.org/");
layout.append(canvas, {288, 360});
layout.append(title, {0, 0});
layout.append(version, {0, 0});
layout.append(website, {0, 0});
append(layout);
image logo(0, 32, 255u << 24, 255u << 16, 255u << 8, 255u << 0);
logo.loadPNG(laevateinnLogo, sizeof laevateinnLogo);
logo.alphaBlend(backgroundColor().rgb());
canvas.setImage(logo);
canvas.update();
setGeometry({128, 128, layout.minimumGeometry().width, layout.minimumGeometry().height});
windowManager->append(this, "AboutWindow");
}

196
higan/target-laevateinn/console/console.cpp
View File

@ -1,196 +0,0 @@
#include "../base.hpp"
ConsoleWindow *consoleWindow = nullptr;
#include "about.cpp"
ConsoleWindow::ConsoleWindow() {
setTitle({"Console - Laevateinn v", Emulator::Version});
setGeometry({64, 640, 640, 400});
setMenuVisible();
menuEmulation.setText("&Emulation");
menuEmulationReloadCartridge.setText("Reload Cartridge");
menuEmulationPowerCycle.setText("Power Cycle");
menuEmulationReset.setText("Reset");
menuEmulationSynchronizeAudio.setText("Synchronize Audio");
menuEmulationSynchronizeAudio.setChecked(settings->synchronizeAudio);
menuEmulationMuteAudio.setText("Mute Audio");
menuEmulationMuteAudio.setChecked(settings->muteAudio);
menuEmulation.append(menuEmulationReloadCartridge, menuEmulationPowerCycle, menuEmulationReset,
menuEmulationSeparator, menuEmulationSynchronizeAudio, menuEmulationMuteAudio);
append(menuEmulation);
menuDebug.setText("&Debug");
menuDebugCPU.setText("CPU");
menuDebugCPU.setChecked(debugger->debug.cpu);
menuDebugSMP.setText("SMP");
menuDebugSMP.setChecked(debugger->debug.smp);
menuDebug.append(menuDebugCPU, menuDebugSMP);
append(menuDebug);
menuTracer.setText("&Tracer");
menuTracerEnable.setText("Enable");
menuTracerMask.setChecked(tracer->mask);
menuTracerMask.setText("Mask");
menuTracerMaskReset.setText("Reset Mask");
menuTracer.append(menuTracerEnable, menuTracerMask, menuTracerMaskReset);
append(menuTracer);
menuWindows.setText("&Windows");
menuWindowsVideoWindow.setText("Video");
menuWindowsCPUDebugger.setText("CPU Debugger");
menuWindowsSMPDebugger.setText("SMP Debugger");
menuWindowsMemoryEditor.setText("Memory Editor");
menuWindowsBreakpointEditor.setText("Breakpoint Editor");
menuWindowsPropertiesViewer.setText("Properties Viewer");
menuWindowsVRAMViewer.setText("VRAM Viewer");
menuWindows.append(menuWindowsVideoWindow, menuWindowsSeparator1, menuWindowsCPUDebugger,
menuWindowsSMPDebugger, menuWindowsSeparator2, menuWindowsMemoryEditor, menuWindowsBreakpointEditor,
menuWindowsPropertiesViewer, menuWindowsVRAMViewer);
append(menuWindows);
menuState.setText("&State");
menuStateSave1.setText("Save - Slot 1");
menuStateSave2.setText("Save - Slot 2");
menuStateSave3.setText("Save - Slot 3");
menuStateSave4.setText("Save - Slot 4");
menuStateSave5.setText("Save - Slot 5");
menuStateLoad1.setText("Load - Slot 1");
menuStateLoad2.setText("Load - Slot 2");
menuStateLoad3.setText("Load - Slot 3");
menuStateLoad4.setText("Load - Slot 4");
menuStateLoad5.setText("Load - Slot 5");
menuState.append(menuStateSave1, menuStateSave2, menuStateSave3, menuStateSave4, menuStateSave5,
menuStateSeparator, menuStateLoad1, menuStateLoad2, menuStateLoad3, menuStateLoad4, menuStateLoad5);
append(menuState);
menuHelp.setText("&Help");
menuHelpAbout.setText("About ...");
menuHelp.append(menuHelpAbout);
append(menuHelp);
layout.setMargin(5);
runButton.setText("Run");
stepButton.setText("Step");
clearButton.setText("Clear");
console.setFont(application->monospaceFont);
layout.append(commandLayout, {~0, 0}, 5);
commandLayout.append(runButton, {80, ~0}, 5);
commandLayout.append(stepButton, {80, ~0}, 5);
commandLayout.append(spacer, {~0, 0});
commandLayout.append(clearButton, {80, ~0});
layout.append(console, {~0, ~0});
append(layout);
onClose = [] { application->quit = true; };
menuEmulationReloadCartridge.onActivate = [&] {
interface->loadCartridge(interface->pathName);
};
menuEmulationPowerCycle.onActivate = [&] {
SFC::system.power();
print("System power cycled\n");
};
menuEmulationReset.onActivate = [&] {
SFC::system.reset();
print("System reset\n");
};
menuEmulationSynchronizeAudio.onToggle = [&] {
audio.set(Audio::Synchronize, settings->synchronizeAudio = menuEmulationSynchronizeAudio.checked());
};
menuEmulationMuteAudio.onToggle = [&] {
settings->muteAudio = menuEmulationMuteAudio.checked();
};
menuDebugCPU.onToggle = [&] { debugger->debug.cpu = menuDebugCPU.checked(); };
menuDebugSMP.onToggle = [&] { debugger->debug.smp = menuDebugSMP.checked(); };
menuTracerEnable.onToggle = [&] { tracer->enable(menuTracerEnable.checked()); };
menuTracerMask.onToggle = [&] { tracer->mask = menuTracerMask.checked(); };
menuTracerMaskReset.onActivate = [&] {
tracer->resetMask();
debugger->print("Tracer mask reset\n");
};
menuWindowsVideoWindow.onActivate = [&] {
videoWindow->setVisible();
videoWindow->setFocused();
};
menuWindowsCPUDebugger.onActivate = [&] {
cpuDebugger->setVisible();
cpuDebugger->setFocused();
};
menuWindowsSMPDebugger.onActivate = [&] {
smpDebugger->setVisible();
smpDebugger->setFocused();
};
menuWindowsMemoryEditor.onActivate = [&] {
memoryEditor->updateView();
memoryEditor->setVisible();
memoryEditor->setFocused();
};
menuWindowsBreakpointEditor.onActivate = [&] {
breakpointEditor->setVisible();
breakpointEditor->setFocused();
};
menuWindowsPropertiesViewer.onActivate = [&] {
propertiesViewer->setVisible();
propertiesViewer->setFocused();
};
menuWindowsVRAMViewer.onActivate = [&] {
vramViewer->setVisible();
vramViewer->setFocused();
};
menuStateSave1.onActivate = [&] { interface->saveState(1); };
menuStateSave2.onActivate = [&] { interface->saveState(2); };
menuStateSave3.onActivate = [&] { interface->saveState(3); };
menuStateSave4.onActivate = [&] { interface->saveState(4); };
menuStateSave5.onActivate = [&] { interface->saveState(5); };
menuStateLoad1.onActivate = [&] { interface->loadState(1); };
menuStateLoad2.onActivate = [&] { interface->loadState(2); };
menuStateLoad3.onActivate = [&] { interface->loadState(3); };
menuStateLoad4.onActivate = [&] { interface->loadState(4); };
menuStateLoad5.onActivate = [&] { interface->loadState(5); };
menuHelpAbout.onActivate = [&] { aboutWindow->setVisible(); };
runButton.onActivate = [&] {
if(debugger->paused) {
print("\n");
debugger->resume();
} else {
debugger->suspend();
}
};
stepButton.onActivate = [&] {
debugger->flags.step = true;
debugger->resume();
};
clearButton.onActivate = [&] {
console.setText("");
};
windowManager->append(this, "ConsoleWindow");
}
void ConsoleWindow::print(const string &text) {
string output = console.text();
output.append(text);
console.setText(output);
console.setCursorPosition(~0);
}

70
higan/target-laevateinn/console/console.hpp
View File

@ -1,70 +0,0 @@
struct ConsoleWindow : Window {
Menu menuEmulation;
Item menuEmulationReloadCartridge;
Item menuEmulationPowerCycle;
Item menuEmulationReset;
Separator menuEmulationSeparator;
CheckItem menuEmulationSynchronizeAudio;
CheckItem menuEmulationMuteAudio;
Menu menuDebug;
CheckItem menuDebugCPU;
CheckItem menuDebugSMP;
Menu menuTracer;
CheckItem menuTracerEnable;
CheckItem menuTracerMask;
Item menuTracerMaskReset;
Menu menuWindows;
Item menuWindowsVideoWindow;
Separator menuWindowsSeparator1;
Item menuWindowsCPUDebugger;
Item menuWindowsSMPDebugger;
Separator menuWindowsSeparator2;
Item menuWindowsMemoryEditor;
Item menuWindowsBreakpointEditor;
Item menuWindowsPropertiesViewer;
Item menuWindowsVRAMViewer;
Menu menuState;
Item menuStateSave1;
Item menuStateSave2;
Item menuStateSave3;
Item menuStateSave4;
Item menuStateSave5;
Separator menuStateSeparator;
Item menuStateLoad1;
Item menuStateLoad2;
Item menuStateLoad3;
Item menuStateLoad4;
Item menuStateLoad5;
Menu menuHelp;
Item menuHelpAbout;
VerticalLayout layout;
HorizontalLayout commandLayout;
Button runButton;
Button stepButton;
Widget spacer;
Button clearButton;
TextEdit console;
void print(const string &text);
ConsoleWindow();
};
struct AboutWindow : Window {
VerticalLayout layout;
Canvas canvas;
Label title;
Label version;
Label website;
AboutWindow();
};
extern ConsoleWindow *consoleWindow;
extern AboutWindow *aboutWindow;

160
higan/target-laevateinn/cpu/cpu.cpp
View File

@ -1,160 +0,0 @@
#include "../base.hpp"
CPUDebugger *cpuDebugger = nullptr;
#include "registers.cpp"
uint24 CPUDebugger::mirror(uint24 addr) {
if((addr & 0x40e000) == 0x0000) addr = 0x7e0000 | (addr & 0x1fff); //$00-3f:80-bf:0000-1fff WRAM
return addr;
}
uint8 CPUDebugger::read(uint24 addr) {
if((addr & 0x40e000) == 0x2000) return ~0; //$00-3f|80-bf:2000-3fff MMIO
if((addr & 0x40e000) == 0x4000) return ~0; //$00-3f|80-bf:4000-5fff MMIO
return SFC::bus.read(mirror(addr));
}
void CPUDebugger::write(uint24 addr, uint8 data) {
if((addr & 0x40e000) == 0x2000) return; //$00-3f|80-bf:2000-3fff MMIO
if((addr & 0x40e000) == 0x4000) return; //$00-3f|80-bf:4000-5fff MMIO
if((addr & 0x40e000) == 0x0000) addr = 0x7e0000 | (addr & 0x1fff); //$00-3f:80-bf:0000-1fff WRAM
return SFC::bus.write(mirror(addr), data);
}
unsigned CPUDebugger::opcodeLength(uint24 addr) {
#define M 5
#define X 6
static unsigned lengthTable[256] = {
2, 2, 2, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
3, 2, 4, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
1, 2, 2, 2, 3, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 3, 2, 2, 2, 1, 3, 1, 1, 4, 3, 3, 4,
1, 2, 3, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
2, 2, 3, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
X, 2, X, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
X, 2, 2, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 2, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
X, 2, 2, 2, 2, 2, 2, 2, 1, M, 1, 1, 3, 3, 3, 4,
2, 2, 2, 2, 3, 2, 2, 2, 1, 3, 1, 1, 3, 3, 3, 4,
};
unsigned length = lengthTable[SFC::bus.read(addr)];
if(length == M) return 3 - (SFC::cpu.regs.e | SFC::cpu.regs.p.m);
if(length == X) return 3 - (SFC::cpu.regs.e | SFC::cpu.regs.p.x);
return length;
#undef M
#undef X
}
void CPUDebugger::updateDisassembly() {
string line[15];
char text[512];
SFC::cpu.disassemble_opcode(text, opcodePC);
text[29] = 0;
line[7] = { "> ", text };
signed addr = opcodePC;
for(signed o = 6; o >= 0; o--) {
for(signed b = 1; b <= 4; b++) {
if(addr - b >= 0 && (debugger->cpuUsage.data[addr - b] & Usage::Exec)) {
addr -= b;
SFC::cpu.disassemble_opcode(text, addr);
text[29] = 0;
line[o] = { " ", text };
break;
}
}
}
addr = opcodePC;
for(signed o = 8; o <= 14; o++) {
for(signed b = 1; b <= 4; b++) {
if(addr + b <= 0xffffff && (debugger->cpuUsage.data[addr + b] & Usage::Exec)) {
addr += b;
SFC::cpu.disassemble_opcode(text, addr);
text[29] = 0;
line[o] = { " ", text };
break;
}
}
}
string output;
for(auto &n : line) {
if(n.empty()) output.append(" ...\n");
else output.append(n, "\n");
}
output.rtrim<1>("\n");
disassembly.setText(output);
registers.setText({
"A:", hex<4>(SFC::cpu.regs.a), " X:", hex<4>(SFC::cpu.regs.x), " Y:", hex<4>(SFC::cpu.regs.y),
" S:", hex<4>(SFC::cpu.regs.s), " D:", hex<4>(SFC::cpu.regs.d), " DB:", hex<2>(SFC::cpu.regs.db), " ",
SFC::cpu.regs.p.n ? "N" : "n", SFC::cpu.regs.p.v ? "V" : "v",
SFC::cpu.regs.e ? (SFC::cpu.regs.p.m ? "1" : "0") : (SFC::cpu.regs.p.m ? "M" : "m"),
SFC::cpu.regs.e ? (SFC::cpu.regs.p.x ? "B" : "b") : (SFC::cpu.regs.p.x ? "X" : "x"),
SFC::cpu.regs.p.d ? "D" : "d", SFC::cpu.regs.p.i ? "I" : "i",
SFC::cpu.regs.p.z ? "Z" : "z", SFC::cpu.regs.p.c ? "C" : "c",
});
}
CPUDebugger::CPUDebugger() {
opcodePC = 0x008000;
setTitle("CPU Debugger");
setGeometry({128, 128, 350, 255});
layout.setMargin(5);
stepInto.setText("Step Into");
stepNMI.setText("NMI");
stepIRQ.setText("IRQ");
autoUpdate.setText("Auto");
update.setText("Update");
disassembly.setFont(application->monospaceFont);
registers.setFont(application->monospaceFont);
registers.setText(" ");
layout.append(controlLayout, {~0, 0}, 5);
controlLayout.append(stepInto, {80, 0}, 5);
controlLayout.append(stepNMI, {40, 0}, 5);
controlLayout.append(stepIRQ, {40, 0}, 5);
controlLayout.append(spacer, {~0, 0});
controlLayout.append(autoUpdate, {0, 0}, 5);
controlLayout.append(update, {80, 0});
layout.append(disassembly, {~0, ~0}, 5);
layout.append(registers, {~0, 0});
append(layout);
stepInto.onActivate = [&] {
debugger->flags.cpu.stepInto = true;
debugger->resume();
};
stepNMI.onActivate = [&] {
debugger->flags.cpu.nmi = true;
debugger->resume();
};
stepIRQ.onActivate = [&] {
debugger->flags.cpu.irq = true;
debugger->resume();
};
update.onActivate = { &CPUDebugger::updateDisassembly, this };
registers.onActivate = [&] {
cpuRegisterEditor->loadRegisters();
cpuRegisterEditor->setVisible();
};
windowManager->append(this, "CPUDebugger");
}

59
higan/target-laevateinn/cpu/cpu.hpp
View File

@ -1,59 +0,0 @@
struct CPUDebugger : Window {
uint24 opcodePC;
VerticalLayout layout;
HorizontalLayout controlLayout;
Button stepInto;
Button stepNMI;
Button stepIRQ;
Widget spacer;
CheckBox autoUpdate;
Button update;
TextEdit disassembly;
Button registers;
uint24 mirror(uint24 addr);
uint8_t read(uint24 addr);
void write(uint24 addr, uint8 data);
unsigned opcodeLength(uint24 addr);
void updateDisassembly();
CPUDebugger();
};
struct CPURegisterEditor : Window {
VerticalLayout layout;
HorizontalLayout primaryLayout;
Label regALabel;
LineEdit regAValue;
Label regXLabel;
LineEdit regXValue;
Label regYLabel;
LineEdit regYValue;
Label regSLabel;
LineEdit regSValue;
Label regDLabel;
LineEdit regDValue;
Label regDBLabel;
LineEdit regDBValue;
HorizontalLayout secondaryLayout;
CheckBox flagN;
CheckBox flagV;
CheckBox flagM;
CheckBox flagX;
CheckBox flagD;
CheckBox flagI;
CheckBox flagZ;
CheckBox flagC;
HorizontalLayout tertiaryLayout;
CheckBox flagE;
Widget spacer;
Button update;
void loadRegisters();
void saveRegisters();
CPURegisterEditor();
};
extern CPUDebugger *cpuDebugger;
extern CPURegisterEditor *cpuRegisterEditor;

105
higan/target-laevateinn/cpu/registers.cpp
View File

@ -1,105 +0,0 @@
CPURegisterEditor *cpuRegisterEditor = nullptr;
CPURegisterEditor::CPURegisterEditor() {
setTitle("CPU Register Editor");
layout.setMargin(5);
regALabel.setText("A:");
regAValue.setFont(application->monospaceFont);
regXLabel.setText("X:");
regXValue.setFont(application->monospaceFont);
regYLabel.setText("Y:");
regYValue.setFont(application->monospaceFont);
regSLabel.setText("S:");
regSValue.setFont(application->monospaceFont);
regDLabel.setText("D:");
regDValue.setFont(application->monospaceFont);
regDBLabel.setText("DB:");
regDBValue.setFont(application->monospaceFont);
flagN.setText("N");
flagV.setText("V");
flagM.setText("M");
flagX.setText("X");
flagD.setText("D");
flagI.setText("I");
flagZ.setText("Z");
flagC.setText("C");
flagE.setText("E");
update.setText("Update");
loadRegisters();
layout.append(primaryLayout, {~0, 0}, 5);
primaryLayout.append(regALabel, {0, 0}, 5);
primaryLayout.append(regAValue, {0, 0}, 5);
primaryLayout.append(regXLabel, {0, 0}, 5);
primaryLayout.append(regXValue, {0, 0}, 5);
primaryLayout.append(regYLabel, {0, 0}, 5);
primaryLayout.append(regYValue, {0, 0}, 5);
primaryLayout.append(regSLabel, {0, 0}, 5);
primaryLayout.append(regSValue, {0, 0}, 5);
primaryLayout.append(regDLabel, {0, 0}, 5);
primaryLayout.append(regDValue, {0, 0}, 5);
primaryLayout.append(regDBLabel, {0, 0}, 5);
primaryLayout.append(regDBValue, {0, 0});
layout.append(secondaryLayout, {~0, 0}, 5);
secondaryLayout.append(flagN, {0, 0}, 5);
secondaryLayout.append(flagV, {0, 0}, 5);
secondaryLayout.append(flagM, {0, 0}, 5);
secondaryLayout.append(flagX, {0, 0}, 5);
secondaryLayout.append(flagD, {0, 0}, 5);
secondaryLayout.append(flagI, {0, 0}, 5);
secondaryLayout.append(flagZ, {0, 0}, 5);
secondaryLayout.append(flagC, {0, 0});
layout.append(tertiaryLayout, {~0, 0});
tertiaryLayout.append(flagE, {0, 0}, 5);
tertiaryLayout.append(spacer, {~0, 0});
tertiaryLayout.append(update, {80, 0});
append(layout);
update.onActivate = [&] {
saveRegisters();
cpuDebugger->updateDisassembly();
setVisible(false);
};
setGeometry({{128, 128}, layout.minimumGeometry().size()});
windowManager->append(this, "CPURegisterEditor");
}
void CPURegisterEditor::loadRegisters() {
regAValue.setText(hex<4>(SFC::cpu.regs.a));
regXValue.setText(hex<4>(SFC::cpu.regs.x));
regYValue.setText(hex<4>(SFC::cpu.regs.y));
regSValue.setText(hex<4>(SFC::cpu.regs.s));
regDValue.setText(hex<4>(SFC::cpu.regs.d));
regDBValue.setText(hex<2>(SFC::cpu.regs.db));
flagN.setChecked(SFC::cpu.regs.p.n);
flagV.setChecked(SFC::cpu.regs.p.v);
flagM.setChecked(SFC::cpu.regs.p.m);
flagX.setChecked(SFC::cpu.regs.p.x);
flagD.setChecked(SFC::cpu.regs.p.d);
flagI.setChecked(SFC::cpu.regs.p.i);
flagZ.setChecked(SFC::cpu.regs.p.z);
flagC.setChecked(SFC::cpu.regs.p.c);
flagE.setChecked(SFC::cpu.regs.e);
}
void CPURegisterEditor::saveRegisters() {
SFC::cpu.regs.a = hex(regAValue.text());
SFC::cpu.regs.x = hex(regXValue.text());
SFC::cpu.regs.y = hex(regYValue.text());
SFC::cpu.regs.s = hex(regSValue.text());
SFC::cpu.regs.d = hex(regDValue.text());
SFC::cpu.regs.db = hex(regDBValue.text());
SFC::cpu.regs.p.n = flagN.checked();
SFC::cpu.regs.p.v = flagV.checked();
SFC::cpu.regs.p.m = flagM.checked();
SFC::cpu.regs.p.x = flagX.checked();
SFC::cpu.regs.p.d = flagD.checked();
SFC::cpu.regs.p.i = flagI.checked();
SFC::cpu.regs.p.z = flagZ.checked();
SFC::cpu.regs.p.c = flagC.checked();
SFC::cpu.regs.e = flagE.checked();
SFC::cpu.update_table(); //cache E/M/X flags
}

76
higan/target-laevateinn/debugger/debugger.cpp
View File

@ -1,76 +0,0 @@
#include "../base.hpp"
Debugger *debugger = nullptr;
#include "hook.cpp"
#include "usage.cpp"
void Debugger::run() {
if(paused == true) {
usleep(2000);
return;
}
SFC::system.run();
if(cpuDebugger->autoUpdate.checked()) cpuDebugger->updateDisassembly();
if(smpDebugger->autoUpdate.checked()) smpDebugger->updateDisassembly();
if(memoryEditor->autoUpdate.checked()) memoryEditor->updateView();
if(propertiesViewer->autoUpdate.checked()) propertiesViewer->updateProperties();
if(vramViewer->autoUpdate.checked()) vramViewer->updateTiles();
}
void Debugger::echo(const string &text) {
consoleWindow->print(text);
}
void Debugger::resume() {
if(paused == false) return;
paused = false;
consoleWindow->runButton.setText("Stop");
}
void Debugger::suspend() {
if(paused == true) return;
paused = true;
flags.step = false;
flags.cpu.stepInto = false;
flags.cpu.nmi = false;
flags.cpu.irq = false;
flags.smp.stepInto = false;
consoleWindow->runButton.setText("Run");
}
Debugger::Debugger() {
paused = true;
flags.step = false;
flags.cpu.stepInto = false;
flags.cpu.nmi = false;
flags.cpu.irq = false;
flags.smp.stepInto = false;
debug.cpu = true;
debug.smp = false;
cpuUsage.allocate(16 * 1024 * 1024);
apuUsage.allocate(64 * 1024);
SFC::cpu.debugger.op_exec = {&Debugger::cpu_op_exec, this};
SFC::cpu.debugger.op_read = {&Debugger::cpu_op_read, this};
SFC::cpu.debugger.op_write = {&Debugger::cpu_op_write, this};
SFC::cpu.debugger.op_nmi = {&Debugger::cpu_op_nmi, this};
SFC::cpu.debugger.op_irq = {&Debugger::cpu_op_irq, this};
SFC::smp.debugger.op_exec = {&Debugger::smp_op_exec, this};
SFC::smp.debugger.op_read = {&Debugger::smp_op_read, this};
SFC::smp.debugger.op_write = {&Debugger::smp_op_write, this};
SFC::ppu.debugger.vram_read = {&Debugger::ppu_vram_read, this};
SFC::ppu.debugger.vram_write = {&Debugger::ppu_vram_write, this};
SFC::ppu.debugger.oam_read = {&Debugger::ppu_oam_read, this};
SFC::ppu.debugger.oam_write = {&Debugger::ppu_oam_write, this};
SFC::ppu.debugger.cgram_read = {&Debugger::ppu_cgram_read, this};
SFC::ppu.debugger.cgram_write = {&Debugger::ppu_cgram_write, this};
}

Some files were not shown because too many files have changed in this diff Show More