Skip to content

C updates, epson ASM opcodes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
logicplace wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

C updates, epson ASM opcodes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57852aa
C updates, epson ASM opcodes
logicplace Mar 4, 2026
17cb076
fix display in debugger, fix registers & comments
logicplace Mar 5, 2026
1ece88f
clear more warnings
logicplace Mar 12, 2026
f19d3fc
add gitignore
logicplace Mar 12, 2026
65e01df
fix some instructions
logicplace Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Build
PokeMini.exe
PokeMiniD.exe
3 changes: 1 addition & 2 deletions dependencies/minizip/ioapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,7 @@ static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
return ret;
}

void fill_fopen_filefunc (pzlib_filefunc_def)
zlib_filefunc_def* pzlib_filefunc_def;
void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
{
pzlib_filefunc_def->zopen_file = fopen_file_func;
pzlib_filefunc_def->zread_file = fread_file_func;
Expand Down
543 changes: 300 additions & 243 deletions platform/debug/CPUWindow.c
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions platform/debug/CPUWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ void StackView_GotoSP(void);
void RAMView_GotoAddr(uint32_t addr, int highlight);

// Disassembler with color codes
TSOpcDec CDisAsm_SOpcDec;
extern TSOpcDec CDisAsm_SOpcDec;

// Any view trap colors
uint32_t AnyView_TrapColor[8];
extern uint32_t AnyView_TrapColor[8];

// Any view new value custom dialog
extern GtkXCustomDialog AnyView_NewValue_CD[];
Expand Down
2 changes: 1 addition & 1 deletion platform/debug/ExternalWindow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static int RunCmdNoWait(const char *runcmd, int atcurrdir)

#ifdef _WIN32
// Shell execute
res = (int)ShellExecute(NULL, "open", argv[0], argpars, launchdir, SW_SHOW) > 32;
res = (INT_PTR)ShellExecute(NULL, "open", argv[0], argpars, launchdir, SW_SHOW) > 32;
#else
// Fork and execute
i = fork();
Expand Down
2 changes: 1 addition & 1 deletion platform/debug/FileAssociation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int FileAssociation_DoRegister(void)
const char *tenam5 = "debug";
const char *tenam6 = "&Debug";
const char *tenam7 = "&Color map";
char tmp[PMTMPV];
char tmp[PMTMPV + 24];
char tmp2[PMTMPV];
char argv0[PMTMPV];
int i;
Expand Down
44 changes: 22 additions & 22 deletions platform/debug/HardIOWindow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ static void ComboReg_changed(GtkComboBox *widget, gpointer data)

static void CheckRegData_toggled(GtkToggleButton *widget, gpointer data)
{
int mask = 1 << (int)data;
int mask = 1 << GPOINTER_TO_INT(data);
uint8_t din;

if (HardIOWindow_InConfigs) return;
Expand All @@ -944,7 +944,7 @@ static void HardIOW_RefreshNow(GtkWidget *widget, gpointer data)

static void HardIOW_Refresh(GtkWidget *widget, gpointer data)
{
int val, index = (int)data;
int val, index = GPOINTER_TO_INT(data);
static int lastrefrindex = -2;

if (lastrefrindex == index) return;
Expand Down Expand Up @@ -976,28 +976,28 @@ static gboolean HardIOWindow_state_event(GtkWidget *widget, GdkEventWindowState

static GtkItemFactoryEntry HardIOWindow_MenuItems[] = {
{ "/_Debugger", NULL, NULL, 0, "<Branch>" },
{ "/Debugger/Run full speed", "F5", Menu_Debug_RunFull, 0, "<Item>" },
{ "/Debugger/Run debug frames (Sound)", "<SHIFT>F5", Menu_Debug_RunDFrameSnd, 0, "<Item>" },
{ "/Debugger/Run debug frames", "<CTRL>F5", Menu_Debug_RunDFrame, 0, "<Item>" },
{ "/Debugger/Run debug steps", "<CTRL>F3", Menu_Debug_RunDStep, 0, "<Item>" },
{ "/Debugger/Single frame", "F4", Menu_Debug_SingleFrame, 0, "<Item>" },
{ "/Debugger/Single step", "F3", Menu_Debug_SingleStep, 0, "<Item>" },
{ "/Debugger/Step skip", "<SHIFT>F3", Menu_Debug_StepSkip, 0, "<Item>" },
{ "/Debugger/Stop", "F2", Menu_Debug_Stop, 0, "<Item>" },
{ "/Debugger/Run full speed", "F5", (GtkItemFactoryCallback)Menu_Debug_RunFull, 0, "<Item>" },
{ "/Debugger/Run debug frames (Sound)", "<SHIFT>F5", (GtkItemFactoryCallback)Menu_Debug_RunDFrameSnd, 0, "<Item>" },
{ "/Debugger/Run debug frames", "<CTRL>F5", (GtkItemFactoryCallback)Menu_Debug_RunDFrame, 0, "<Item>" },
{ "/Debugger/Run debug steps", "<CTRL>F3", (GtkItemFactoryCallback)Menu_Debug_RunDStep, 0, "<Item>" },
{ "/Debugger/Single frame", "F4", (GtkItemFactoryCallback)Menu_Debug_SingleFrame, 0, "<Item>" },
{ "/Debugger/Single step", "F3", (GtkItemFactoryCallback)Menu_Debug_SingleStep, 0, "<Item>" },
{ "/Debugger/Step skip", "<SHIFT>F3", (GtkItemFactoryCallback)Menu_Debug_StepSkip, 0, "<Item>" },
{ "/Debugger/Stop", "F2", (GtkItemFactoryCallback)Menu_Debug_Stop, 0, "<Item>" },

{ "/_Refresh", NULL, NULL, 0, "<Branch>" },
{ "/Refresh/Now!", NULL, HardIOW_RefreshNow, 0, "<Item>" },
{ "/Refresh/Now!", NULL, (GtkItemFactoryCallback)HardIOW_RefreshNow, 0, "<Item>" },
{ "/Refresh/sep1", NULL, NULL, 0, "<Separator>" },
{ "/Refresh/100% 72fps", NULL, HardIOW_Refresh, 0, "<RadioItem>" },
{ "/Refresh/ 50% 36fps", NULL, HardIOW_Refresh, 1, "/Refresh/100% 72fps" },
{ "/Refresh/ 33% 24fps", NULL, HardIOW_Refresh, 2, "/Refresh/100% 72fps" },
{ "/Refresh/ 25% 18fps", NULL, HardIOW_Refresh, 3, "/Refresh/100% 72fps" },
{ "/Refresh/ 17% 12fps", NULL, HardIOW_Refresh, 5, "/Refresh/100% 72fps" },
{ "/Refresh/ 12% 9fps", NULL, HardIOW_Refresh, 7, "/Refresh/100% 72fps" },
{ "/Refresh/ 8% 6fps", NULL, HardIOW_Refresh, 11, "/Refresh/100% 72fps" },
{ "/Refresh/ 3% 2fps", NULL, HardIOW_Refresh, 35, "/Refresh/100% 72fps" },
{ "/Refresh/ 1% 1fps", NULL, HardIOW_Refresh, 71, "/Refresh/100% 72fps" },
{ "/Refresh/Custom...", NULL, HardIOW_Refresh, -1, "/Refresh/100% 72fps" },
{ "/Refresh/100% 72fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 0, "<RadioItem>" },
{ "/Refresh/ 50% 36fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 1, "/Refresh/100% 72fps" },
{ "/Refresh/ 33% 24fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 2, "/Refresh/100% 72fps" },
{ "/Refresh/ 25% 18fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 3, "/Refresh/100% 72fps" },
{ "/Refresh/ 17% 12fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 5, "/Refresh/100% 72fps" },
{ "/Refresh/ 12% 9fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 7, "/Refresh/100% 72fps" },
{ "/Refresh/ 8% 6fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 11, "/Refresh/100% 72fps" },
{ "/Refresh/ 3% 2fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 35, "/Refresh/100% 72fps" },
{ "/Refresh/ 1% 1fps", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, 71, "/Refresh/100% 72fps" },
{ "/Refresh/Custom...", NULL, (GtkItemFactoryCallback)HardIOW_Refresh, -1, "/Refresh/100% 72fps" },
};
static gint HardIOWindow_MenuItemsNum = sizeof(HardIOWindow_MenuItems) / sizeof(*HardIOWindow_MenuItems);

Expand Down Expand Up @@ -1054,7 +1054,7 @@ int HardIOWindow_Create(void)
gtk_widget_show(GTK_WIDGET(ComboReg));
for (i=0; i<8; i++) {
CheckRegData[i] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label("???"));
g_signal_connect(CheckRegData[i], "toggled", G_CALLBACK(CheckRegData_toggled), (gpointer)(7-i));
g_signal_connect(CheckRegData[i], "toggled", G_CALLBACK(CheckRegData_toggled), GINT_TO_POINTER(7-i));
gtk_toggle_button_set_mode(CheckRegData[i], TRUE);
gtk_box_pack_start(VBox2, GTK_WIDGET(CheckRegData[i]), FALSE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(CheckRegData[i]));
Expand Down
60 changes: 30 additions & 30 deletions platform/debug/IRQWindow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void IRQWindow_Render(int force)
static void ComboPri_changed(GtkComboBox *widget, gpointer data)
{
if (IRQWindow_InConfigs) return;
switch((int)data) {
switch(GPOINTER_TO_INT(data)) {
case 0: PMR_IRQ_PRI1 &= ~0xC0;
PMR_IRQ_PRI1 |= gtk_combo_box_get_active(ComboPri[0]) << 6;
break;
Expand Down Expand Up @@ -185,7 +185,7 @@ static void CheckEna_toggled(GtkToggleButton *togglebutton, gpointer data)
{
uint8_t regn, mask;
if (IRQWindow_InConfigs) return;
switch ((int)data) {
switch (GPOINTER_TO_INT(data)) {
case 0: regn = 1; mask = 0x80; break;
case 1: regn = 1; mask = 0x40; break;
case 2: regn = 1; mask = 0x20; break;
Expand Down Expand Up @@ -238,7 +238,7 @@ static void CheckAct_toggled(GtkToggleButton *togglebutton, gpointer data)
{
uint8_t regn, mask;
if (IRQWindow_InConfigs) return;
switch ((int)data) {
switch (GPOINTER_TO_INT(data)) {
case 0: regn = 1; mask = 0x80; break;
case 1: regn = 1; mask = 0x40; break;
case 2: regn = 1; mask = 0x20; break;
Expand Down Expand Up @@ -351,7 +351,7 @@ static void IRQW_RefreshNow(GtkWidget *widget, gpointer data)

static void IRQW_Refresh(GtkWidget *widget, gpointer data)
{
int val, index = (int)data;
int val, index = GPOINTER_TO_INT(data);
static int lastrefrindex = -2;

if (lastrefrindex == index) return;
Expand Down Expand Up @@ -383,35 +383,35 @@ static gboolean IRQWindow_state_event(GtkWidget *widget, GdkEventWindowState *ev

static GtkItemFactoryEntry IRQWindow_MenuItems[] = {
{ "/_View", NULL, NULL, 0, "<Branch>" },
{ "/View/IRQ Priority", NULL, IRQW_View_Priority, 0, "<CheckItem>" },
{ "/View/IRQ Enable", NULL, IRQW_View_Enable, 0, "<CheckItem>" },
{ "/View/IRQ Active", NULL, IRQW_View_Active, 0, "<CheckItem>" },
{ "/View/IRQ Priority", NULL, (GtkItemFactoryCallback)IRQW_View_Priority, 0, "<CheckItem>" },
{ "/View/IRQ Enable", NULL, (GtkItemFactoryCallback)IRQW_View_Enable, 0, "<CheckItem>" },
{ "/View/IRQ Active", NULL, (GtkItemFactoryCallback)IRQW_View_Active, 0, "<CheckItem>" },
{ "/View/sep1", NULL, NULL, 0, "<Separator>" },
{ "/View/Frames in single-row", NULL, IRQW_View_Frame1Row, 0, "<CheckItem>" },
{ "/View/Frames in single-row", NULL, (GtkItemFactoryCallback)IRQW_View_Frame1Row, 0, "<CheckItem>" },

{ "/_Debugger", NULL, NULL, 0, "<Branch>" },
{ "/Debugger/Run full speed", "F5", Menu_Debug_RunFull, 0, "<Item>" },
{ "/Debugger/Run debug frames (Sound)", "<SHIFT>F5", Menu_Debug_RunDFrameSnd, 0, "<Item>" },
{ "/Debugger/Run debug frames", "<CTRL>F5", Menu_Debug_RunDFrame, 0, "<Item>" },
{ "/Debugger/Run debug steps", "<CTRL>F3", Menu_Debug_RunDStep, 0, "<Item>" },
{ "/Debugger/Single frame", "F4", Menu_Debug_SingleFrame, 0, "<Item>" },
{ "/Debugger/Single step", "F3", Menu_Debug_SingleStep, 0, "<Item>" },
{ "/Debugger/Step skip", "<SHIFT>F3", Menu_Debug_StepSkip, 0, "<Item>" },
{ "/Debugger/Stop", "F2", Menu_Debug_Stop, 0, "<Item>" },
{ "/Debugger/Run full speed", "F5", (GtkItemFactoryCallback)Menu_Debug_RunFull, 0, "<Item>" },
{ "/Debugger/Run debug frames (Sound)", "<SHIFT>F5", (GtkItemFactoryCallback)Menu_Debug_RunDFrameSnd, 0, "<Item>" },
{ "/Debugger/Run debug frames", "<CTRL>F5", (GtkItemFactoryCallback)Menu_Debug_RunDFrame, 0, "<Item>" },
{ "/Debugger/Run debug steps", "<CTRL>F3", (GtkItemFactoryCallback)Menu_Debug_RunDStep, 0, "<Item>" },
{ "/Debugger/Single frame", "F4", (GtkItemFactoryCallback)Menu_Debug_SingleFrame, 0, "<Item>" },
{ "/Debugger/Single step", "F3", (GtkItemFactoryCallback)Menu_Debug_SingleStep, 0, "<Item>" },
{ "/Debugger/Step skip", "<SHIFT>F3", (GtkItemFactoryCallback)Menu_Debug_StepSkip, 0, "<Item>" },
{ "/Debugger/Stop", "F2", (GtkItemFactoryCallback)Menu_Debug_Stop, 0, "<Item>" },

{ "/_Refresh", NULL, NULL, 0, "<Branch>" },
{ "/Refresh/Now!", NULL, IRQW_RefreshNow, 0, "<Item>" },
{ "/Refresh/Now!", NULL, (GtkItemFactoryCallback)IRQW_RefreshNow, 0, "<Item>" },
{ "/Refresh/sep1", NULL, NULL, 0, "<Separator>" },
{ "/Refresh/100% 72fps", NULL, IRQW_Refresh, 0, "<RadioItem>" },
{ "/Refresh/ 50% 36fps", NULL, IRQW_Refresh, 1, "/Refresh/100% 72fps" },
{ "/Refresh/ 33% 24fps", NULL, IRQW_Refresh, 2, "/Refresh/100% 72fps" },
{ "/Refresh/ 25% 18fps", NULL, IRQW_Refresh, 3, "/Refresh/100% 72fps" },
{ "/Refresh/ 17% 12fps", NULL, IRQW_Refresh, 5, "/Refresh/100% 72fps" },
{ "/Refresh/ 12% 9fps", NULL, IRQW_Refresh, 7, "/Refresh/100% 72fps" },
{ "/Refresh/ 8% 6fps", NULL, IRQW_Refresh, 11, "/Refresh/100% 72fps" },
{ "/Refresh/ 3% 2fps", NULL, IRQW_Refresh, 35, "/Refresh/100% 72fps" },
{ "/Refresh/ 1% 1fps", NULL, IRQW_Refresh, 71, "/Refresh/100% 72fps" },
{ "/Refresh/Custom...", NULL, IRQW_Refresh, -1, "/Refresh/100% 72fps" },
{ "/Refresh/100% 72fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 0, "<RadioItem>" },
{ "/Refresh/ 50% 36fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 1, "/Refresh/100% 72fps" },
{ "/Refresh/ 33% 24fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 2, "/Refresh/100% 72fps" },
{ "/Refresh/ 25% 18fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 3, "/Refresh/100% 72fps" },
{ "/Refresh/ 17% 12fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 5, "/Refresh/100% 72fps" },
{ "/Refresh/ 12% 9fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 7, "/Refresh/100% 72fps" },
{ "/Refresh/ 8% 6fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 11, "/Refresh/100% 72fps" },
{ "/Refresh/ 3% 2fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 35, "/Refresh/100% 72fps" },
{ "/Refresh/ 1% 1fps", NULL, (GtkItemFactoryCallback)IRQW_Refresh, 71, "/Refresh/100% 72fps" },
{ "/Refresh/Custom...", NULL, (GtkItemFactoryCallback)IRQW_Refresh, -1, "/Refresh/100% 72fps" },
};
static gint IRQWindow_MenuItemsNum = sizeof(IRQWindow_MenuItems) / sizeof(*IRQWindow_MenuItems);

Expand Down Expand Up @@ -520,7 +520,7 @@ int IRQWindow_Create(void)
gtk_table_attach(TablePri, GTK_WIDGET(LabelsPri[i]), 0, 1, i, i+1, GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show(GTK_WIDGET(LabelsPri[i]));
ComboPri[i] = GTK_COMBO_BOX(gtk_combo_box_new_text());
g_signal_connect(ComboPri[i], "changed", G_CALLBACK(ComboPri_changed), (gpointer)i);
g_signal_connect(ComboPri[i], "changed", G_CALLBACK(ComboPri_changed), GINT_TO_POINTER(i));
LoadPriOnCombo(ComboPri[i]);
gtk_table_attach(TablePri, GTK_WIDGET(ComboPri[i]), 1, 2, i, i+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
gtk_widget_show(GTK_WIDGET(ComboPri[i]));
Expand All @@ -535,7 +535,7 @@ int IRQWindow_Create(void)
gtk_widget_show(GTK_WIDGET(VBoxEna));
for (i=0; i<27; i++) {
CheckEna[i] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(IRQEnaAct_Txt[i]));
g_signal_connect(CheckEna[i], "toggled", G_CALLBACK(CheckEna_toggled), (gpointer)i);
g_signal_connect(CheckEna[i], "toggled", G_CALLBACK(CheckEna_toggled), GINT_TO_POINTER(i));
gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(CheckEna[i]), TRUE);
gtk_box_pack_start(VBoxEna, GTK_WIDGET(CheckEna[i]), FALSE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(CheckEna[i]));
Expand All @@ -550,7 +550,7 @@ int IRQWindow_Create(void)
gtk_widget_show(GTK_WIDGET(VBoxAct));
for (i=0; i<27; i++) {
CheckAct[i] = GTK_TOGGLE_BUTTON(gtk_check_button_new_with_label(IRQEnaAct_Txt[i]));
g_signal_connect(CheckAct[i], "toggled", G_CALLBACK(CheckAct_toggled), (gpointer)i);
g_signal_connect(CheckAct[i], "toggled", G_CALLBACK(CheckAct_toggled), GINT_TO_POINTER(i));
gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(CheckAct[i]), TRUE);
gtk_box_pack_start(VBoxAct, GTK_WIDGET(CheckAct[i]), FALSE, TRUE, 0);
gtk_widget_show(GTK_WIDGET(CheckAct[i]));
Expand Down
Loading