From 272cd213391b5ce87cb2aeac263b3eedb0f19a07 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 20 Dec 2017 15:33:08 -0500 Subject: Add NDEBUG (NOAGBPRN) support to pokeruby. --- include/assert.h | 43 +++++++++++++++++++++++++++++++++++++++++++ include/config.h | 16 ++++++++++++++++ include/global.h | 1 + 3 files changed, 60 insertions(+) create mode 100755 include/assert.h (limited to 'include') diff --git a/include/assert.h b/include/assert.h new file mode 100755 index 000000000..7a5e727e2 --- /dev/null +++ b/include/assert.h @@ -0,0 +1,43 @@ +#ifndef GUARD_GBASDKASSERT_H +#define GUARD_GBASDKASSERT_H + +// this header is based on the +// GBA SDK IsAgbAssert.h. + +#ifdef NOAGBPRN + #define AGBPrintInit() + #define AGBPutc(pBuf) + #define AGBPrint(pBuf) + #define AGBPrintf(...) + #define AGBPrintFlush1Block() + #define AGBPrintFlush() + #define AGBAssert(pFile, nLine, pExpression, nStopProgram) +#else + // without NOAGBPRN defined, this enables asserts for usage + // on a standard GBA debugger unit or in emulators that + // support it. + void AGBPrintInit(void); + void AGBPutc(const char pBuf); + void AGBPrint(const char *pBuf); + void AGBPrintf(const char *pBuf, ...); + void AGBPrintFlush1Block(void); + void AGBPrintFlush(void); + void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); +#endif + +// when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console +// immediately after usage. +#ifdef NOAGBPRN + #define AGB_ASSERT(expression) +#else + #define AGB_ASSERT(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 1); +#endif + +#ifdef NOAGBPRN + #define AGB_WARNING(expression) +#else + #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); +#endif + + +#endif diff --git a/include/config.h b/include/config.h index 6a77c4c74..d9ed70a7c 100644 --- a/include/config.h +++ b/include/config.h @@ -1,6 +1,22 @@ #ifndef GUARD_CONFIG_H #define GUARD_CONFIG_H +// In the Generation 3 games, Asserts were used in various debug builds. +// Ruby/Sapphire and Emerald do not have these asserts while Fire Red +// still has them in the ROM. This is because the developers forgot +// to define NOAGBPRN before release, which is actually supposed to be +// NDEBUG, however this has been changed as Ruby's actual debug build +// does not use the AGBPrint features. + +// To note, Ruby/Sapphire likely did not use AGBPrint. This is because +// the german debug ROM of Ruby did not have any uses of AGBPrint and +// the assert commands but instead a "crash" screen. This config exists +// for convenience for the user of pokeruby and NOT because it is +// authoritative. These additions are for user convenience based on +// officially recommended SDK practices for debugging and is therefore +// still in part authoritative. +#define NOAGBPRN + #ifndef REVISION #define REVISION 0 #endif diff --git a/include/global.h b/include/global.h index 6670f3837..7bd82f74e 100644 --- a/include/global.h +++ b/include/global.h @@ -3,6 +3,7 @@ #include "gba/gba.h" #include "config.h" +#include "assert.h" // IDE support #ifdef __APPLE__ -- cgit v1.2.3 From d50dcfcdd37aedab6352e4953cb2be04f2691113 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 2 Jan 2018 00:53:26 -0500 Subject: add no print support. --- include/assert.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/assert.h b/include/assert.h index 7a5e727e2..d724290fa 100755 --- a/include/assert.h +++ b/include/assert.h @@ -16,6 +16,16 @@ // without NOAGBPRN defined, this enables asserts for usage // on a standard GBA debugger unit or in emulators that // support it. + +// no$gba support, due to the different method no$gba uses to print debug strings. +// currently cannot use IsNoGba due to no$gba doing a gloriously fuck up of a job and +// breaking the version identifier. +#define AGBPrint(pBuf) \ +{ \ + NOGBAPrint(pBuf); \ + AGBPrint(pBuf); \ +} + void AGBPrintInit(void); void AGBPutc(const char pBuf); void AGBPrint(const char *pBuf); @@ -23,6 +33,9 @@ void AGBPrintFlush1Block(void); void AGBPrintFlush(void); void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); + // NOGBA PROTOTYPES FOR LIBISAGBPRN.C + bool32 IsNoGba(void); + void NOGBAPrint(const char *pBuf); #endif // when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console @@ -39,5 +52,4 @@ #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); #endif - #endif -- cgit v1.2.3 From 6c5e0ef4d873ae89708b7ebc547f2243893359f4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 2 Jan 2018 00:54:56 -0500 Subject: remove function that doesn't exist anymore. --- include/assert.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/assert.h b/include/assert.h index d724290fa..5a134d7c9 100755 --- a/include/assert.h +++ b/include/assert.h @@ -33,8 +33,7 @@ void AGBPrintFlush1Block(void); void AGBPrintFlush(void); void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); - // NOGBA PROTOTYPES FOR LIBISAGBPRN.C - bool32 IsNoGba(void); + // NOGBA PROTOTYPE FOR LIBISAGBPRN.C void NOGBAPrint(const char *pBuf); #endif -- cgit v1.2.3 From d4df8046d45e50e19d2305bd4388e47087949960 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 6 Jan 2018 21:52:05 -0500 Subject: use firered isagbprint.h and NDEBUG --- include/assert.h | 43 ----------------------------------------- include/config.h | 4 ++-- include/gba/gba.h | 1 + include/gba/isagbprint.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/global.h | 3 +-- 5 files changed, 54 insertions(+), 47 deletions(-) delete mode 100755 include/assert.h create mode 100755 include/gba/isagbprint.h (limited to 'include') diff --git a/include/assert.h b/include/assert.h deleted file mode 100755 index 0c1e5bf77..000000000 --- a/include/assert.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef GUARD_GBASDKASSERT_H -#define GUARD_GBASDKASSERT_H - -// this header is based on the -// GBA SDK IsAgbAssert.h. - -#ifdef NOAGBPRN - #define AGBPrintInit() - #define AGBPutc(pBuf) - #define AGBPrint(pBuf) - #define AGBPrintf(...) - #define AGBPrintFlush1Block() - #define AGBPrintFlush() - #define AGBAssert(pFile, nLine, pExpression, nStopProgram) -#else - // without NOAGBPRN defined, this enables asserts for usage - // on a standard GBA debugger unit or in emulators that - // support it. - - void AGBPrintInit(void); - void AGBPutc(const char pBuf); - void AGBPrint(const char *pBuf); - void AGBPrintf(const char *pBuf, ...); - void AGBPrintFlush1Block(void); - void AGBPrintFlush(void); - void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); -#endif - -// when using AGB_WARNING, be sure to flush after as AGBAssert does not flush the string to console -// immediately after usage. -#ifdef NOAGBPRN - #define AGB_ASSERT(expression) -#else - #define AGB_ASSERT(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 1); -#endif - -#ifdef NOAGBPRN - #define AGB_WARNING(expression) -#else - #define AGB_WARNING(expression) (expression) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #expression, 0); -#endif - -#endif diff --git a/include/config.h b/include/config.h index d9ed70a7c..7661324db 100644 --- a/include/config.h +++ b/include/config.h @@ -4,7 +4,7 @@ // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red // still has them in the ROM. This is because the developers forgot -// to define NOAGBPRN before release, which is actually supposed to be +// to define NDEBUG before release, which is actually supposed to be // NDEBUG, however this has been changed as Ruby's actual debug build // does not use the AGBPrint features. @@ -15,7 +15,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -#define NOAGBPRN +#define NDEBUG #ifndef REVISION #define REVISION 0 diff --git a/include/gba/gba.h b/include/gba/gba.h index 42ae3cdde..349344031 100644 --- a/include/gba/gba.h +++ b/include/gba/gba.h @@ -7,5 +7,6 @@ #include "gba/multiboot.h" #include "gba/syscall.h" #include "gba/macro.h" +#include "gba/isagbprint.h" #endif // GUARD_GBA_GBA_H diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h new file mode 100755 index 000000000..c5eb456c3 --- /dev/null +++ b/include/gba/isagbprint.h @@ -0,0 +1,50 @@ +#ifndef GUARD_GBA_ISAGBPRINT_H +#define GUARD_GBA_ISAGBPRINT_H + +#ifdef NDEBUG +#define AGBPrintInit() +#define AGBPutc(cChr) +#define AGBPrint(pBuf) +#define AGBPrintf(pBuf, ...) +#define AGBPrintFlush1Block() +#define AGBPrintFlush() +#define AGBAssert(pFile, nLine, pExpression, nStopProgram) +#else +void AGBPrintInit(void); +void AGBPutc(const char cChr); +void AGBPrint(const char *pBuf); +void AGBPrintf(const char *pBuf, ...); +void AGBPrintFlush1Block(void); +void AGBPrintFlush(void); +void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopProgram); +#endif + +#undef AGB_ASSERT +#ifdef NDEBUG +#define AGB_ASSERT(exp) +#else +#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); +#endif + +#undef AGB_WARNING +#ifdef NDEBUG +#define AGB_WARNING(exp) +#else +#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); +#endif + +// for matching purposes + +#ifdef NDEBUG +#define AGB_ASSERT_EX(exp, file, line) +#else +#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); +#endif + +#ifdef NDEBUG +#define AGB_WARNING_EX(exp, file, line) +#else +#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); +#endif + +#endif // GUARD_GBA_ISAGBPRINT_H diff --git a/include/global.h b/include/global.h index 4c118db13..d0af4a4d1 100644 --- a/include/global.h +++ b/include/global.h @@ -1,9 +1,8 @@ #ifndef GUARD_GLOBAL_H #define GUARD_GLOBAL_H +#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" -#include "config.h" -#include "assert.h" // IDE support #if defined(__APPLE__) || defined(__CYGWIN__) -- cgit v1.2.3 From 897107d1eae649e71213539aba7146fe2b2e2e70 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sun, 7 Jan 2018 23:45:53 -0500 Subject: NDEBUG which is supposed to be NDEBUG... --- include/config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/config.h b/include/config.h index 7661324db..6d9e15a15 100644 --- a/include/config.h +++ b/include/config.h @@ -4,9 +4,8 @@ // In the Generation 3 games, Asserts were used in various debug builds. // Ruby/Sapphire and Emerald do not have these asserts while Fire Red // still has them in the ROM. This is because the developers forgot -// to define NDEBUG before release, which is actually supposed to be -// NDEBUG, however this has been changed as Ruby's actual debug build -// does not use the AGBPrint features. +// to define NDEBUG before release, however this has been changed as +// Ruby's actual debug build does not use the AGBPrint features. // To note, Ruby/Sapphire likely did not use AGBPrint. This is because // the german debug ROM of Ruby did not have any uses of AGBPrint and -- cgit v1.2.3 From dcf12f9ecdbaab26afb8899eaa05f4cab09a5f82 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 8 Jan 2018 22:01:47 -0500 Subject: nocashgba printf --- include/config.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/config.h b/include/config.h index 6d9e15a15..796da359c 100644 --- a/include/config.h +++ b/include/config.h @@ -16,6 +16,13 @@ // still in part authoritative. #define NDEBUG +// To enable print debugging, comment out "#define NDEBUG". This allows +// the various AGBPrint functions to be used. (See include/gba/isagbprint.h). +// Some emulators support a debug console window: uncomment NoCashGBAPrint() +// and NoCashGBAPrintf() in libisagbprn.c to use no$gba's own proprietary +// printing system. Use NoCashGBAPrint() and NoCashGBAPrintf() like you +// would normally use AGBPrint() and AGBPrintf(). + #ifndef REVISION #define REVISION 0 #endif -- cgit v1.2.3 From 2dd85b9f853f7d6774faaf52d908961695b3b112 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 01:22:35 -0500 Subject: scrub ld_script for bloat --- include/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/config.h b/include/config.h index 796da359c..bd2ad3356 100644 --- a/include/config.h +++ b/include/config.h @@ -14,7 +14,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -#define NDEBUG +// #define NDEBUG // To enable print debugging, comment out "#define NDEBUG". This allows // the various AGBPrint functions to be used. (See include/gba/isagbprint.h). -- cgit v1.2.3 From fc66800520a28a6940cee922b60074da1d624157 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 9 Jan 2018 01:23:11 -0500 Subject: you idiot, leave NDEBUG defined --- include/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/config.h b/include/config.h index bd2ad3356..796da359c 100644 --- a/include/config.h +++ b/include/config.h @@ -14,7 +14,7 @@ // authoritative. These additions are for user convenience based on // officially recommended SDK practices for debugging and is therefore // still in part authoritative. -// #define NDEBUG +#define NDEBUG // To enable print debugging, comment out "#define NDEBUG". This allows // the various AGBPrint functions to be used. (See include/gba/isagbprint.h). -- cgit v1.2.3