Skip to content

Commit 5a2a8b3

Browse files
mateoconlechugamateoconlechuga
committed
Revert "[core] remove gui_console_err_printf"
This reverts commit 45658ee.
1 parent 45658ee commit 5a2a8b3

File tree

10 files changed

+34
-26
lines changed

10 files changed

+34
-26
lines changed

‎core/asic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static asic_rev_t report_reset(asic_rev_t loaded_rev, bool* python) {
110110
}
111111
}
112112
else {
113-
gui_console_printf("[CEmu] Could not determine boot code version.\n");
113+
gui_console_err_printf("[CEmu] Could not determine boot code version.\n");
114114
}
115115
gui_console_printf("[CEmu] Default ASIC revision is Rev %c.\n", "AIM"[(int)default_rev - 1]);
116116

‎core/cpu.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static uint8_t cpu_read_in(uint16_t pio) {
165165
static void cpu_write_out(uint16_t pio, uint8_t value) {
166166
if (unprivileged_code()) {
167167
control.protectionStatus |= 2;
168-
gui_console_printf("[CEmu] NMI reset cause by an out instruction in unprivileged code.\n");
168+
gui_console_err_printf("[CEmu] NMI reset cause by an out instruction in unprivileged code.\n");
169169
cpu_nmi();
170170
}
171171
port_write_byte(pio, value);

‎core/emu.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,22 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
7070
gui_console_printf("[CEmu] Loading Emulator Image...\n");
7171

7272
if (!file) {
73-
gui_console_printf("[CEmu] Image file nonexistent.\n");
73+
gui_console_err_printf("[CEmu] Image file nonexistent.\n");
7474
goto rerr;
7575
}
7676

7777
if (fread(&version, sizeof(version), 1, file) != 1) goto rerr;
7878

7979
if (version != IMAGE_VERSION) {
80-
gui_console_printf("[CEmu] Error in versioning.\n");
80+
gui_console_err_printf("[CEmu] Error in versioning.\n");
8181
goto rerr;
8282
}
8383

8484
asic_free();
8585
asic_init();
8686

8787
if (!asic_restore(file)) {
88-
gui_console_printf("[CEmu] Error reading image.\n");
88+
gui_console_err_printf("[CEmu] Error reading image.\n");
8989
goto rerr;
9090
}
9191

@@ -109,14 +109,14 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
109109
file = fopen_utf8(path, "rb");
110110

111111
if (!file) {
112-
gui_console_printf("[CEmu] ROM file nonexistent.\n");
112+
gui_console_err_printf("[CEmu] ROM file nonexistent.\n");
113113
goto rerr;
114114
}
115115

116116
if (fseek(file, 0L, SEEK_END) < 0) goto rerr;
117117
size = (size_t)ftell(file);
118118
if (size > SIZE_FLASH) {
119-
gui_console_printf("[CEmu] Invalid ROM size (%u bytes | max %u bytes)\n", (unsigned int)size, SIZE_FLASH);
119+
gui_console_err_printf("[CEmu] Invalid ROM size (%u bytes | max %u bytes)\n", (unsigned int)size, SIZE_FLASH);
120120
goto rerr;
121121
}
122122
rewind(file);
@@ -125,7 +125,7 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
125125
asic_init();
126126

127127
if (fread(mem.flash.block, size, 1, file) != 1) {
128-
gui_console_printf("[CEmu] Error reading ROM image\n");
128+
gui_console_err_printf("[CEmu] Error reading ROM image\n");
129129
goto rerr;
130130
}
131131

@@ -189,7 +189,7 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
189189
set_device_type(device_type);
190190
} else {
191191
set_device_type(TI84PCE);
192-
gui_console_printf("[CEmu] Could not determine device device_type.\n");
192+
gui_console_err_printf("[CEmu] Could not determine device device_type.\n");
193193
state = EMU_STATE_NOT_A_CE;
194194
}
195195

@@ -198,7 +198,7 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
198198
size_t size;
199199

200200
if (mem.ram.block == NULL) {
201-
gui_console_printf("[CEmu] Emulator inactive, cannot load RAM file.\n");
201+
gui_console_err_printf("[CEmu] Emulator inactive, cannot load RAM file.\n");
202202
goto rerr;
203203
}
204204

@@ -207,19 +207,19 @@ emu_state_t emu_load(emu_data_t type, const char *path) {
207207

208208
file = fopen_utf8(path, "rb");
209209
if (!file) {
210-
gui_console_printf("[CEmu] RAM file nonexistent.\n");
210+
gui_console_err_printf("[CEmu] RAM file nonexistent.\n");
211211
goto rerr;
212212
}
213213
if (fseek(file, 0L, SEEK_END) < 0) goto rerr;
214214
size = (size_t)ftell(file);
215215
if (size > SIZE_RAM) {
216-
gui_console_printf("[CEmu] Invalid RAM size (%u bytes | max %u bytes)\n", (unsigned int)size, SIZE_RAM);
216+
gui_console_err_printf("[CEmu] Invalid RAM size (%u bytes | max %u bytes)\n", (unsigned int)size, SIZE_RAM);
217217
goto rerr;
218218
}
219219
rewind(file);
220220

221221
if (fread(mem.ram.block, 1, size, file) != size) {
222-
gui_console_printf("[CEmu] Error reading RAM image.\n", (unsigned int)size, SIZE_RAM);
222+
gui_console_err_printf("[CEmu] Error reading RAM image.\n", (unsigned int)size, SIZE_RAM);
223223
goto rerr;
224224
}
225225

‎core/emu.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ void emu_exit(void); /* exit emulation */
3838
/* if you want debugging support, don't forget about the debug callbacks as well */
3939
void gui_console_clear(void); /* sent to clear the console */
4040
void gui_console_printf(const char *format, ...); /* printf from the core to stdout */
41+
void gui_console_err_printf(const char *format, ...); /* printf from the core to stderr */
4142

4243
/* called at reset or state load, indicates hardware info and allows specifying a revision on reset
4344
* params:

‎core/lcd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ static void lcd_write(const uint16_t pio, const uint8_t value, bool poke) {
597597
} else if (index == 0x010) {
598598
write8(lcd.upbase, bit_offset, value);
599599
if (lcd.upbase & 7) {
600-
gui_console_printf("[CEmu] Warning: Aligning LCD panel\n");
600+
gui_console_err_printf("[CEmu] Warning: Aligning LCD panel\n");
601601
}
602602
lcd.upbase &= ~7U;
603603
lcd_update();

‎core/link.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int EMSCRIPTEN_KEEPALIVE emu_send_variables(const char *const *files, int num, i
3131
const size_t argv_size = (1+num) * sizeof(char *);
3232
char **argv = malloc(argv_size);
3333
if (!argv) {
34-
gui_console_printf("[CEmu] Transfer Error: can't allocate transfer commands... wut\n");
34+
gui_console_err_printf("[CEmu] Transfer Error: can't allocate transfer commands... wut\n");
3535
return LINK_ERR;
3636
}
3737

@@ -42,15 +42,15 @@ int EMSCRIPTEN_KEEPALIVE emu_send_variables(const char *const *files, int num, i
4242
const size_t arg_size = 7 + strlen(files[i]) + 1;
4343
argv[i+1] = malloc(arg_size);
4444
if (!argv[i+1]) {
45-
gui_console_printf("[CEmu] Transfer Error: can't allocate transfer command... wut\n");
45+
gui_console_err_printf("[CEmu] Transfer Error: can't allocate transfer command... wut\n");
4646
num = i;
4747
goto alloc_err;
4848
}
4949
snprintf(argv[i+1], arg_size, "send%s:%s", locations[location], files[i]);
5050
}
5151
err = usb_plug_device(1+num, (const char *const *)argv, progress_handler, progress_context);
5252
if (err != 0) {
53-
gui_console_printf("[CEmu] USB transfer error code %d.\n", err);
53+
gui_console_err_printf("[CEmu] USB transfer error code %d.\n", err);
5454
}
5555
else {
5656
gui_console_printf("[CEmu] USB transfer(s) starting...\n");
@@ -128,7 +128,7 @@ int emu_receive_variable(const char *file, const calc_var_t *vars, int count) {
128128
w_err:
129129
(void)fclose(fd);
130130
if(remove(file)) {
131-
gui_console_printf("[CEmu] Transfer Error: Please contact the developers\n");
131+
gui_console_err_printf("[CEmu] Transfer Error: Please contact the developers\n");
132132
}
133133
return LINK_ERR;
134134
}

‎core/mem.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -736,13 +736,13 @@ void mem_write_cpu(uint32_t addr, uint8_t value) {
736736

737737
if (addr == control.stackLimit) {
738738
control.protectionStatus |= 1;
739-
gui_console_printf("[CEmu] NMI reset caused by writing to the stack limit at address %#06x. Hint: Probably a stack overflow (aka too much recursion).\n", addr);
739+
gui_console_err_printf("[CEmu] NMI reset caused by writing to the stack limit at address %#06x. Hint: Probably a stack overflow (aka too much recursion).\n", addr);
740740
cpu_nmi();
741741
} /* writes to stack limit succeed */
742742

743743
if (addr >= control.protectedStart && addr <= control.protectedEnd && unprivileged_code()) {
744744
control.protectionStatus |= 2;
745-
gui_console_printf("[CEmu] NMI reset caused by writing to protected memory (%#06x through %#06x) at address %#06x from unprivileged code.\n", control.protectedStart, control.protectedEnd, addr);
745+
gui_console_err_printf("[CEmu] NMI reset caused by writing to protected memory (%#06x through %#06x) at address %#06x from unprivileged code.\n", control.protectedStart, control.protectedEnd, addr);
746746
cpu_nmi();
747747
} else { /* writes to protected memory are ignored */
748748
switch((addr >> 20) & 0xF) {
@@ -751,7 +751,7 @@ void mem_write_cpu(uint32_t addr, uint8_t value) {
751751
case 0x4: case 0x5: case 0x6: case 0x7:
752752
if (unprivileged_code()) {
753753
control.protectionStatus |= 2;
754-
gui_console_printf("[CEmu] NMI reset caused by writing to flash at address %#06x from unprivileged code. Hint: Possibly a null pointer dereference.\n", addr);
754+
gui_console_err_printf("[CEmu] NMI reset caused by writing to flash at address %#06x from unprivileged code. Hint: Possibly a null pointer dereference.\n", addr);
755755
cpu_nmi();
756756
} else {
757757
mem_write_flash(addr, value);
@@ -796,7 +796,7 @@ void mem_write_cpu(uint32_t addr, uint8_t value) {
796796
debug.bufferErr[debug.bufErrPos] = (char)value;
797797
debug.bufErrPos = (debug.bufErrPos + 1) % SIZEOF_DBG_BUFFER;
798798
if (!value) {
799-
gui_console_printf("%s", debug.bufferErr);
799+
gui_console_err_printf("%s", debug.bufferErr);
800800
debug.bufErrPos = 0;
801801
}
802802
break;

‎core/os/os-emscripten.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void gui_console_printf(const char *fmt, ...) {
7070
va_end(ap);
7171
}
7272

73-
void gui_console_printf(const char *fmt, ...) {
73+
void gui_console_err_printf(const char *fmt, ...) {
7474
va_list ap;
7575
va_start(ap, fmt);
7676
vfprintf(stderr, fmt, ap);

‎core/usb/dusb.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ static dusb_state_t dusb_detect(dusb_context_t *context) {
496496
return DUSB_VAR_NEXT_STATE;
497497
}
498498
invalid:
499-
gui_console_printf("[CEmu] Transfer warning: file parsing failed\n");
499+
gui_console_err_printf("[CEmu] Transfer warning: file parsing failed\n");
500500
return DUSB_NEXT_COMMAND_STATE;
501501
}
502502

@@ -1031,15 +1031,15 @@ static int dusb_transition(usb_event_t *event, dusb_state_t state) {
10311031
if (context->command->vartype == CALC_VAR_TYPE_FLASH_APP || context->start == context->command->file_length - 2) {
10321032
state = DUSB_NEXT_COMMAND_STATE;
10331033
} else if (!dusb_detect_var(context)) {
1034-
gui_console_printf("[CEmu] Transfer warning: variable parsing failed\n");
1034+
gui_console_err_printf("[CEmu] Transfer warning: variable parsing failed\n");
10351035
state = DUSB_NEXT_COMMAND_STATE;
10361036
} else {
10371037
gui_console_printf("[CEmu] Transferring variable: %.*s\n", context->command->varname_utf8_length, context->command->varname_utf8);
10381038
state = DUSB_VAR_PING_WAIT_STATE;
10391039
}
10401040
continue;
10411041
case DUSB_INVALID_STATE:
1042-
gui_console_printf("[CEmu] USB transfer failed, stopping activity\n");
1042+
gui_console_err_printf("[CEmu] USB transfer failed, stopping activity\n");
10431043
event->type = USB_DESTROY_EVENT;
10441044
break;
10451045
}

‎gui/qt/emuthread.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ void gui_console_printf(const char *format, ...) {
3333
va_end(args);
3434
}
3535

36+
void gui_console_err_printf(const char *format, ...) {
37+
va_list args;
38+
va_start(args, format);
39+
emu->writeConsole(EmuThread::ConsoleErr, format, args);
40+
va_end(args);
41+
}
42+
3643
void gui_debug_open(int reason, uint32_t data) {
3744
emu->debugOpen(reason, data);
3845
}

0 commit comments

Comments
 (0)