Skip to content

Commit f62e680

Browse files
earlephilhowerearlephilhower
authored
Reduce LWIP flash 5.4K by cleaning debug prints (#3154)
In non-debug cases the string to `panic()` isn't actually sent to the Serial port, or anywhere in fact. When there is no debug port defined, replace the panic(str) of LWIP_PLATFORM_ASSERT with panic("lwip") instead. This doesn't effect debugging because the source line of the LWIP_ASSERT will still show the full string (GDB shows the source). Also, LWIP_DEBUG is a flag by definition, not value, so fix lwipopts.h to not define it or the LWIP_X debug defines unless LWIP_DEBUG is set by the compliation. Saves 5480 bytes of flash for LWIP (Pico W, 2W, Ethernet) apps. * -O2 for Pico2 builds, -O3 shows a GCC error When -O3 is used to build LWIP, GCC emits a bogus error while compiling DHCP.C: > ../dhcp.c:1453:30: error: writing 1 byte into a region of size 0 DHCP_OPTIONS_LEN was verified as being DHCP_MIN_OPTIONS_LEN (68U) and not 0 using #ifs and #errors in the dhcp.h header, but GCC somehow forgets this while doing it's checks on O3. Looks to be a bug in GCC to me, so drop to -O2 for RP204 builds.
1 parent 0234b2f commit f62e680

File tree

2 files changed

+35
-33
lines changed

2 files changed

+35
-33
lines changed

‎include/lwipopts.h‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ extern void interrupts();
1111
#define SYS_ARCH_PROTECT(lev) {(void) lev; noInterrupts();}
1212
#define SYS_ARCH_UNPROTECT(lev) {(void) lev; interrupts();}
1313

14+
#ifndef DEBUG_RP2040_PORT
15+
extern void panic(const char *fmt, ...);
16+
#define LWIP_PLATFORM_ASSERT(x) panic("lwip")
17+
#endif
18+
1419
extern unsigned long __lwip_rand(void);
1520
#define LWIP_RAND() __lwip_rand()
1621

@@ -77,38 +82,6 @@ extern void __setSystemTime(unsigned long long sec, unsigned long us);
7782
#define SNTP_SERVER_DNS 1
7883

7984
#ifndef LWIP_DEBUG
80-
#define LWIP_DEBUG 0
81-
#endif
82-
#define ETHARP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
83-
#define NETIF_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
84-
#define PBUF_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
85-
#define API_LIB_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
86-
#define API_MSG_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
87-
#define SOCKETS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
88-
#define ICMP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
89-
#define INET_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
90-
#define IP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
91-
#define IP_REASS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
92-
#define RAW_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
93-
#define MEM_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
94-
#define MEMP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
95-
#define SYS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
96-
#define TCP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
97-
#define TCP_INPUT_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
98-
#define TCP_OUTPUT_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
99-
#define TCP_RTO_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
100-
#define TCP_CWND_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
101-
#define TCP_WND_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
102-
#define TCP_FR_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
103-
#define TCP_QLEN_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
104-
#define TCP_RST_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
105-
#define UDP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
106-
#define TCPIP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
107-
#define PPP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
108-
#define SLIP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
109-
#define DHCP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
110-
111-
#if !LWIP_DEBUG
11285
#define LWIP_STATS 0
11386
#define LWIP_STATS_DISPLAY 0
11487
#define MEM_STATS 0
@@ -122,8 +95,37 @@ extern void __setSystemTime(unsigned long long sec, unsigned long us);
12295
#define SYS_STATS 1
12396
#define MEMP_STATS 1
12497
#define LINK_STATS 1
98+
#define ETHARP_DEBUG LWIP_DBG_ON
99+
#define NETIF_DEBUG LWIP_DBG_ON
100+
#define PBUF_DEBUG LWIP_DBG_ON
101+
#define API_LIB_DEBUG LWIP_DBG_ON
102+
#define API_MSG_DEBUG LWIP_DBG_ON
103+
#define SOCKETS_DEBUG LWIP_DBG_ON
104+
#define ICMP_DEBUG LWIP_DBG_ON
105+
#define INET_DEBUG LWIP_DBG_ON
106+
#define IP_DEBUG LWIP_DBG_ON
107+
#define IP_REASS_DEBUG LWIP_DBG_ON
108+
#define RAW_DEBUG LWIP_DBG_ON
109+
#define MEM_DEBUG LWIP_DBG_ON
110+
#define MEMP_DEBUG LWIP_DBG_ON
111+
#define SYS_DEBUG LWIP_DBG_ON
112+
#define TCP_DEBUG LWIP_DBG_ON
113+
#define TCP_INPUT_DEBUG LWIP_DBG_ON
114+
#define TCP_OUTPUT_DEBUG LWIP_DBG_ON
115+
#define TCP_RTO_DEBUG LWIP_DBG_ON
116+
#define TCP_CWND_DEBUG LWIP_DBG_ON
117+
#define TCP_WND_DEBUG LWIP_DBG_ON
118+
#define TCP_FR_DEBUG LWIP_DBG_ON
119+
#define TCP_QLEN_DEBUG LWIP_DBG_ON
120+
#define TCP_RST_DEBUG LWIP_DBG_ON
121+
#define UDP_DEBUG LWIP_DBG_ON
122+
#define TCPIP_DEBUG LWIP_DBG_ON
123+
#define PPP_DEBUG LWIP_DBG_ON
124+
#define SLIP_DEBUG LWIP_DBG_ON
125+
#define DHCP_DEBUG LWIP_DBG_ON
125126
#endif
126127

128+
127129
#ifdef __cplusplus
128130
}
129131
#endif // __cplusplus

‎tests/build-rp2350.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ elif [ "$BUILD_PARITY" = "odd" ]; then
1515
rem=1
1616
fi
1717

18-
export FQBN=pico:rp2040:rpipico2:flash=4194304_0,arch=arm,freq=150,opt=Optimize3,rtti=Disabled,stackprotect=Disabled,exceptions=Disabled,dbgport=Disabled,dbglvl=None,usbstack=picosdk,ipbtstack=ipv4only,uploadmethod=default
18+
export FQBN=pico:rp2040:rpipico2:flash=4194304_0,arch=arm,freq=150,opt=Optimize2,rtti=Disabled,stackprotect=Disabled,exceptions=Disabled,dbgport=Disabled,dbglvl=None,usbstack=picosdk,ipbtstack=ipv4only,uploadmethod=default
1919
export PICO_BOARD=rp2350
2020

2121
install_arduino nodebug

0 commit comments

Comments
 (0)