Reduced compiled code size (removed some inlines, reorganized sms z80)

Author: ducalex

base.cmake

@@ -21,7 +21,7 @@ macro(rg_setup_compile_options)
 
     if($ENV{ENABLE_PROFILING})
         # Still debating whether -fno-inline is necessary or not...
-        component_compile_options(-DENABLE_PROFILING -fno-inline -finstrument-functions)
+        component_compile_options(-DENABLE_PROFILING -finstrument-functions)
     endif()
 
     if($ENV{ENABLE_DEBUGGING})

gnuboy-go/components/gnuboy/lcd.c

@@ -55,6 +55,18 @@ static byte pix[8];
 int enable_window_offset_hack = 0;
 
 
+/**
+ * Helper macros
+ */
+
+#define priused(attr) ({un32 *a = (un32*)(attr); (int)((a[0]|a[1]|a[2]|a[3]|a[4]|a[5]|a[6]|a[7])&0x80808080);})
+
+#define blendcpy(dest, src, b, cnt) {					\
+	byte *s = (src), *d = (dest), _b = (b), c = (cnt); 	\
+	while(c--) *(d + c) = *(s + c) | _b; 				\
+}
+
+
 /**
  * Drawing routines
  */
@@ -265,17 +277,6 @@ static inline void wnd_scan()
 	}
 }
 
-static inline void blendcpy(byte *dest, byte *src, byte b, int cnt)
-{
-	while (cnt--) *(dest++) = *(src++) | b;
-}
-
-static inline int priused(void *attr)
-{
-	un32 *a = attr;
-	return (int)((a[0]|a[1]|a[2]|a[3]|a[4]|a[5]|a[6]|a[7])&0x80808080);
-}
-
 static inline void bg_scan_pri()
 {
 	int cnt, i;

gnuboy-go/components/gnuboy/sound.c

@@ -55,37 +55,10 @@ struct snd snd;
 #define S3 (snd.ch[2])
 #define S4 (snd.ch[3])
 
-
-static inline void s1_freq_d(int d)
-{
-	if (RATE > (d<<4)) S1.freq = 0;
-	else S1.freq = (RATE << 17)/d;
-}
-
-static inline void s1_freq()
-{
-	s1_freq_d(2048 - (((R_NR14&7)<<8) + R_NR13));
-}
-
-static inline void s2_freq()
-{
-	int d = 2048 - (((R_NR24&7)<<8) + R_NR23);
-	if (RATE > (d<<4)) S2.freq = 0;
-	else S2.freq = (RATE << 17)/d;
-}
-
-static inline void s3_freq()
-{
-	int d = 2048 - (((R_NR34&7)<<8) + R_NR33);
-	if (RATE > (d<<3)) S3.freq = 0;
-	else S3.freq = (RATE << 21)/d;
-}
-
-static inline void s4_freq()
-{
-	S4.freq = (freqtab[R_NR43&7] >> (R_NR43 >> 4)) * RATE;
-	if (S4.freq >> 18) S4.freq = 1<<18;
-}
+#define s1_freq() {int d = 2048 - (((R_NR14&7)<<8) + R_NR13); S1.freq = (RATE > (d<<4)) ? 0 : (RATE << 17)/d;}
+#define s2_freq() {int d = 2048 - (((R_NR24&7)<<8) + R_NR23); S2.freq = (RATE > (d<<4)) ? 0 : (RATE << 17)/d;}
+#define s3_freq() {int d = 2048 - (((R_NR34&7)<<8) + R_NR33); S3.freq = (RATE > (d<<3)) ? 0 : (RATE << 21)/d;}
+#define s4_freq() {S4.freq = (freqtab[R_NR43&7] >> (R_NR43 >> 4)) * RATE; if (S4.freq >> 18) S4.freq = 1<<18;}
 
 void sound_dirty()
 {
@@ -187,7 +160,8 @@ void IRAM_ATTR sound_mix()
 					S1.swfreq = f;
 					R_NR13 = f;
 					R_NR14 = (R_NR14 & 0xF8) | (f>>8);
-					s1_freq_d(2048 - f);
+					// s1_freq_d(2048 - f);
+					s1_freq();
 				}
 			}
 			s <<= 2;

huexpress-go/components/huexpress/engine/h6280.c

@@ -42,7 +42,7 @@
 #define pull_8bit() (*(sp_base + ++reg_s))
 #define pull_16bit() (pull_8bit() | pull_8bit() << 8)
 
-#include "h6280_opcodes.h"
+#include "h6280_instr.h"
 
 #define Int6502(Type)                                       \
 {                                                           \

…ponents/huexpress/engine/h6280_opcodes.h …omponents/huexpress/engine/h6280_instr.hhuexpress-go/components/huexpress/engine/h6280_opcodes.h renamed to huexpress-go/components/huexpress/engine/h6280_instr.h huexpress-go/components/huexpress/engine/h6280_opcodes.h renamed to huexpress-go/components/huexpress/engine/h6280_instr.h

@@ -285,6 +285,32 @@ enum _VDC_REG {
 /**
  * Inlined Memory Functions
  */
+#if 1
+
+#define Read8(addr) ({							\
+	uint16 a = (addr);							\
+	uchar *page = PageR[a >> 13]; 				\
+	(page == IOAREA) ? IO_read(a) : page[a]; 	\
+})
+
+#define Write8(addr, byte) {					\
+	uint16 a = (addr), b = (byte); 				\
+	uchar *page = PageW[a >> 13]; 				\
+	if (page == IOAREA) IO_write(a, b); 		\
+	else page[a] = b;							\
+}
+
+#define Read16(addr) ({							\
+	uint16 a = (addr); 							\
+	*((uint16*)(PageR[a >> 13] + a));			\
+})
+
+#define Write16(addr, word) {					\
+	uint16 a = (addr), w = (word); 				\
+	*((uint16*)(PageR[a >> 13] + a)) = w;		\
+}
+
+#else
 
 static inline uchar
 Read8(uint16 addr)
@@ -320,6 +346,8 @@ Write16(uint16 addr, uint16 word)
 	*((uint16*)(PageR[addr >> 13] + (addr))) = word;
 }
 
+#endif
+
 static inline void
 BankSet(uchar P, uchar V)
 {
@@ -330,7 +358,6 @@ BankSet(uchar P, uchar V)
     PageW[P] = (MemoryMapW[V] == IOAREA) ? (IOAREA) : (MemoryMapW[V] - P * 0x2000);
 }
 
-
 /**
   * Inlined HW Functions
   */

huexpress-go/components/huexpress/engine/hard_pce.h

@@ -28,18 +28,6 @@ static uint32 rand_val[6]; // Noise seed
 static uint32 k[6];
 static uint32 r[6];
 
-static inline int
-mseq(uint32 * rand_val)
-{
-    if (*rand_val & 0x00080000) {
-        *rand_val = ((*rand_val ^ 0x0004) << 1) + 1;
-        return 1;
-    } else {
-        *rand_val <<= 1;
-        return 0;
-    }
-}
-
 
 int
 snd_init()
@@ -228,7 +216,14 @@ psg_update(char *buf, int ch, unsigned dwSize)
             k[ch] += 3000 + Np * 512;
 
             if ((t = (k[ch] / (uint32) host.sound.freq)) >= 1) {
-                r[ch] = mseq(&rand_val[ch]);
+                // mseq
+                if (rand_val[ch] & 0x00080000) {
+                    rand_val[ch] = ((rand_val[ch] ^ 0x0004) << 1) + 1;
+                    r[ch] = 1;
+                } else {
+                    rand_val[ch] <<= 1;
+                    r[ch] = 0;
+                }
                 k[ch] -= host.sound.freq * t;
             }
 

huexpress-go/components/huexpress/engine/sound.c

@@ -31,8 +31,4 @@
 
 #define PCE_PATH_MAX 192
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-// #ifndef __cplusplus
-// #undef inline
-// #endif
+#define INLINE static inline __attribute__((__always_inline__))

huexpress-go/components/huexpress/includes/config.h

@@ -1069,28 +1069,9 @@ static mem_t *mem;
 
 #ifdef NES6502_FASTMEM
 
-INLINE uint8 fast_readbyte(uint16 address)
-{
-   return mem->pages[address >> MEM_PAGESHIFT][address];
-}
-
-INLINE uint16 fast_readword(uint32 address)
-{
-   if ((address & MEM_PAGEMASK) != MEM_PAGEMASK) // Page cross
-   {
-      return PAGE_READWORD(mem->pages[address >> MEM_PAGESHIFT], address);
-   }
-   return mem_getword(address);
-}
-
-INLINE void writebyte(uint32 address, uint8 value)
-{
-   if (address < 0x2000) {
-      mem->ram[address & 0x7FF] = value;
-   } else {
-      mem_putbyte(address, value);
-   }
-}
+#define fast_readbyte(a) ({uint16 _a = (a); mem->pages[_a >> MEM_PAGESHIFT][_a];})
+#define fast_readword(a) ({uint16 _a = (a); ((_a & MEM_PAGEMASK) != MEM_PAGEMASK) ? PAGE_READWORD(mem->pages[_a >> MEM_PAGESHIFT], _a) : mem_getword(_a);})
+#define writebyte(a, v)  {uint16 _a = (a), _v = (v); if (_a < 0x2000) mem->ram[_a & 0x7FF] = _v; else mem_putbyte(_a, _v);}
 
 #else /* !NES6502_FASTMEM */