22
33#include "panicdump_crc32.h"
44#include "panicdump_port.h"
5+ #include "panicdump_util.h"
56#include "panicdump_wire.h"
67
7- #include <string.h>
8-
98#if defined(__GNUC__ ) || defined(__clang__ )
109__attribute__((section (".noinit" ), aligned (4 )))
1110#endif
@@ -66,9 +65,9 @@ static void panicdump_write_stack(uint8_t *wire, const panicdump_stack_t *stack)
6665 panicdump_write_u32_field (wire , offset , stack -> stack_bytes );
6766 offset += 4u ;
6867 if (stack -> stack_bytes != 0u ) {
69- memcpy (wire + offset , stack -> data , PANICDUMP_WIRE_STACK_BYTES );
68+ panicdump_copy_bytes (wire + offset , stack -> data , PANICDUMP_WIRE_STACK_BYTES );
7069 } else {
71- memset (wire + offset , 0 , PANICDUMP_WIRE_STACK_BYTES );
70+ panicdump_zero_bytes (wire + offset , PANICDUMP_WIRE_STACK_BYTES );
7271 }
7372}
7473
@@ -106,7 +105,7 @@ static void panicdump_read_stack(panicdump_stack_t *stack, const uint8_t *wire)
106105 if (stack -> stack_bytes > PANICDUMP_WIRE_STACK_BYTES ) {
107106 stack -> stack_bytes = 0u ;
108107 }
109- memcpy (stack -> data , p + 8u , PANICDUMP_WIRE_STACK_BYTES );
108+ panicdump_copy_bytes (stack -> data , p + 8u , PANICDUMP_WIRE_STACK_BYTES );
110109}
111110
112111static bool panicdump_dump_fields_valid (const panicdump_dump_t * dump )
@@ -165,7 +164,7 @@ static void panicdump_encode_header(uint8_t *wire, const panicdump_dump_t *dump)
165164
166165static void panicdump_encode_dump_fields (uint8_t * wire , const panicdump_dump_t * dump )
167166{
168- memset (wire , 0 , PANICDUMP_WIRE_TOTAL_SIZE );
167+ panicdump_zero_bytes (wire , PANICDUMP_WIRE_TOTAL_SIZE );
169168 panicdump_write_u32_field (wire , PANICDUMP_WIRE_MAGIC_OFFSET , dump -> magic );
170169 panicdump_encode_header (wire , dump );
171170 panicdump_write_regs (wire , & dump -> regs );
@@ -174,7 +173,7 @@ static void panicdump_encode_dump_fields(uint8_t *wire, const panicdump_dump_t *
174173
175174static void panicdump_decode_dump_fields (panicdump_dump_t * dump , const uint8_t * wire )
176175{
177- memset (dump , 0 , sizeof (* dump ));
176+ panicdump_zero_bytes (dump , sizeof (* dump ));
178177 dump -> magic = panicdump_wire_load_u32 (wire + PANICDUMP_WIRE_MAGIC_OFFSET );
179178 dump -> version = panicdump_wire_load_u16 (wire + PANICDUMP_WIRE_VERSION_OFFSET );
180179 dump -> header_size = panicdump_wire_load_u16 (wire + PANICDUMP_WIRE_HEADER_SIZE_OFFSET );
@@ -191,7 +190,9 @@ static void panicdump_decode_dump_fields(panicdump_dump_t *dump, const uint8_t *
191190
192191static void panicdump_write_magic (uint8_t * wire , uint32_t magic )
193192{
194- * (volatile uint32_t * )(void * )(wire + PANICDUMP_WIRE_MAGIC_OFFSET ) = magic ;
193+ volatile uint32_t * magic_ptr =
194+ (volatile uint32_t * )(wire + PANICDUMP_WIRE_MAGIC_OFFSET );
195+ * magic_ptr = magic ;
195196}
196197
197198static void panicdump_write_commit_marker (uint8_t * wire )
@@ -296,7 +297,7 @@ bool panicdump_has_valid(void)
296297
297298void panicdump_clear (void )
298299{
299- memset (g_dump_wire , 0 , sizeof (g_dump_wire ));
300+ panicdump_zero_bytes (g_dump_wire , sizeof (g_dump_wire ));
300301}
301302
302303const panicdump_dump_t * panicdump_get (void )
@@ -443,13 +444,15 @@ void panicdump_commit_snapshot(const panicdump_regs_t *regs,
443444 if (regs ) {
444445 panicdump_write_regs (g_dump_wire , regs );
445446 } else {
446- memset (g_dump_wire + PANICDUMP_WIRE_REGS_OFFSET , 0 , PANICDUMP_WIRE_REGS_SIZE );
447+ panicdump_zero_bytes (g_dump_wire + PANICDUMP_WIRE_REGS_OFFSET ,
448+ PANICDUMP_WIRE_REGS_SIZE );
447449 }
448450
449451 if (stack ) {
450452 panicdump_write_stack (g_dump_wire , stack );
451453 } else {
452- memset (g_dump_wire + PANICDUMP_WIRE_STACK_OFFSET , 0 , PANICDUMP_WIRE_STACK_SIZE );
454+ panicdump_zero_bytes (g_dump_wire + PANICDUMP_WIRE_STACK_OFFSET ,
455+ PANICDUMP_WIRE_STACK_SIZE );
453456 }
454457
455458 panicdump_write_u32_field (g_dump_wire , PANICDUMP_WIRE_CRC32_OFFSET ,
0 commit comments