Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-27 06:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Expose unused variables and improve logging

Browse Source 
* Adds support for RELEASE_ logging (logging even with NDEBUG builds)
This commit is contained in:
Aaron Culliney 2014-06-14 11:17:34 -07:00
parent 86076697b9
commit 8ded3fa0f1
2 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/common.h
View File

@ -72,51 +72,60 @@
#define MAX(a,b) (((a) >= (b)) ? (a) : (b))
#endif
#ifndef NDEBUG
# if defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-variable"
# elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunused-variable"
# endif
extern bool do_logging;
extern FILE *error_log;
#define ERRLOG(/* err message format string, args */...) \
if (do_logging) { \
int saverr = errno; errno = 0; \
fprintf(error_log ? error_log : stderr, "%s:%d - ", __FILE__, __LINE__); \
fprintf(error_log ? error_log : stderr, __VA_ARGS__); \
if (saverr) { \
fprintf(error_log ? error_log : stderr, " (syserr: %s)", strerror(saverr)); \
} \
fprintf(error_log ? error_log : stderr, "\n"); \
#define _LOG(...) \
int saverr = errno; \
errno = 0; \
fprintf(error_log, "%s:%d - ", __FILE__, __LINE__); \
fprintf(error_log, __VA_ARGS__); \
if (saverr) { \
fprintf(error_log, " (syserr: %s)", strerror(saverr)); \
} \
fprintf(error_log, "\n");
#ifndef NDEBUG
#define ERRLOG(...) \
if (do_logging) { \
_LOG(__VA_ARGS__); \
}
#define ERRQUIT(...) \
if (do_logging) { \
ERRLOG(__VA_ARGS__); \
exit(1); \
_LOG(__VA_ARGS__); \
} \
exit(1);
#define LOG(...) \
if (do_logging) { \
errno = 0; \
_LOG(__VA_ARGS__); \
}
#else // NDEBUG
#if defined(__GNUC__)
# pragma GCC diagnostic pop
#elif defined(__clang__)
# pragma clang diagnostic pop
#endif
#define ERRLOG(...) \
do { } while(0);
#define ERRQUIT(...) \
do { } while(0);
#define LOG(...) \
do { } while(0);
#endif
#define LOG(...) \
#define RELEASE_ERRLOG(...) \
do { \
_LOG(__VA_ARGS__); \
} while (0);
#define RELEASE_LOG(...) \
do { \
errno = 0; \
ERRLOG(__VA_ARGS__); \
_LOG(__VA_ARGS__); \
} while(0);
#define Free(X) \

9
src/misc.c
View File

@ -25,6 +25,11 @@ static unsigned char apple_iie_rom[32768]; /* //e */
bool do_logging = true; // also controlled by NDEBUG
FILE *error_log = NULL;
__attribute__((constructor))
static void _init_common() {
error_log = stderr;
}
GLUE_BANK_READ(read_ram_bank,base_d000_rd)
GLUE_BANK_MAYBEWRITE(write_ram_bank,base_d000_wrt)
GLUE_BANK_READ(read_ram_lc,base_e000_rd)
@ -73,9 +78,7 @@ uint8_t *base_cxrom;
------------------------------------------------------------------------- */
void c_debug_illegal_bcd()
{
ERRLOG("Illegal/undefined BCD operation encountered, debug break on c_debug_illegal_bcd to debug...");
char *ptr = (char*)0x0bad;
*ptr = 0x1337; // segfault
RELEASE_LOG("Illegal/undefined BCD operation encountered, debug break on c_debug_illegal_bcd to debug...");
}