Browse Source

Move backtrace to the HAL folder (#10790)

Scott Lahteine 6 years ago
parent
commit
59f7861bcb
No account linked to committer's email address

+ 7
- 6
Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp View File

@@ -22,10 +22,12 @@
22 22
 
23 23
 #ifdef ARDUINO_ARCH_SAM
24 24
 
25
-#include "../../inc/MarlinConfig.h"
26
-#include "../../Marlin.h"
27
-#include "../../backtrace/unwinder.h"
28
-#include "../../backtrace/unwmemaccess.h"
25
+#include "../../core/macros.h"
26
+#include "../../core/serial.h"
27
+#include <stdarg.h>
28
+
29
+#include "../backtrace/unwinder.h"
30
+#include "../backtrace/unwmemaccess.h"
29 31
 
30 32
 // Debug monitor that dumps to the Programming port all status when
31 33
 // an exception or WDT timeout happens - And then resets the board
@@ -66,7 +68,6 @@ static void TXBegin(void) {
66 68
   UART->UART_CR = UART_CR_RXEN | UART_CR_TXEN;
67 69
 }
68 70
 
69
-
70 71
 // Send character through UART with no interrupts
71 72
 static void TX(char c) {
72 73
   while (!(UART->UART_SR & UART_SR_TXRDY)) { WDT_Restart(WDT); sw_barrier(); };
@@ -333,4 +334,4 @@ __attribute__((naked)) void RSTC_Handler(void) {
333 334
   );
334 335
 }
335 336
 
336
-#endif
337
+#endif // ARDUINO_ARCH_SAM

Marlin/src/backtrace/backtrace.cpp → Marlin/src/HAL/backtrace/backtrace.cpp View File

@@ -26,7 +26,9 @@
26 26
 
27 27
 #include "unwinder.h"
28 28
 #include "unwmemaccess.h"
29
-#include "../Marlin.h"
29
+
30
+#include "../../core/serial.h"
31
+#include <stdarg.h>
30 32
 
31 33
 // Dump a backtrace entry
32 34
 static bool UnwReportOut(void* ctx, const UnwReport* bte) {

Marlin/src/backtrace/backtrace.h → Marlin/src/HAL/backtrace/backtrace.h View File


Marlin/src/backtrace/unwarm.cpp → Marlin/src/HAL/backtrace/unwarm.cpp View File

@@ -171,5 +171,5 @@ bool UnwMemReadRegister(UnwState * const state, const uint32_t addr, RegData * c
171 171
   }
172 172
   else return false;                            // Not in the hash, and failed to read from memory
173 173
 }
174
-#endif
175 174
 
175
+#endif // __arm__ || __thumb__

Marlin/src/backtrace/unwarm.h → Marlin/src/HAL/backtrace/unwarm.h View File

@@ -140,8 +140,4 @@ bool UnwMemWriteRegister(UnwState * const state, const uint32_t addr, const RegD
140 140
 bool UnwMemReadRegister(UnwState * const state, const uint32_t addr, RegData * const reg);
141 141
 void UnwMemHashGC(UnwState * const state);
142 142
 
143
-#endif /* UNWARM_H */
144
-
145
-/* END OF FILE */
146
-
147
-
143
+#endif // UNWARM_H

Marlin/src/backtrace/unwarm_arm.cpp → Marlin/src/HAL/backtrace/unwarm_arm.cpp View File

@@ -593,4 +593,5 @@ UnwResult UnwStartArm(UnwState * const state) {
593 593
 
594 594
   return UNWIND_UNSUPPORTED;
595 595
 }
596
-#endif
596
+
597
+#endif // __arm__ || __thumb__

Marlin/src/backtrace/unwarm_thumb.cpp → Marlin/src/HAL/backtrace/unwarm_thumb.cpp View File

@@ -1124,5 +1124,4 @@ UnwResult UnwStartThumb(UnwState * const state) {
1124 1124
   return UNWIND_SUCCESS;
1125 1125
 }
1126 1126
 
1127
-#endif
1128
-
1127
+#endif // __arm__ || __thumb__

Marlin/src/backtrace/unwarmbytab.cpp → Marlin/src/HAL/backtrace/unwarmbytab.cpp View File

@@ -438,5 +438,4 @@ UnwResult UnwindByTableStart(UnwindFrame* frame, const UnwindCallbacks *cb, void
438 438
   return err;
439 439
 }
440 440
 
441
-#endif
442
-
441
+#endif // __arm__ || __thumb__

Marlin/src/backtrace/unwarmbytab.h → Marlin/src/HAL/backtrace/unwarmbytab.h View File

@@ -31,6 +31,4 @@ typedef struct {
31 31
 
32 32
 UnwResult UnwindByTableStart(UnwindFrame* frame, const UnwindCallbacks *cb, void *data);
33 33
 
34
-#endif
35
-
36
-/* END OF FILE */
34
+#endif // UNWARMBYTAB_H

Marlin/src/backtrace/unwarmmem.cpp → Marlin/src/HAL/backtrace/unwarmmem.cpp View File

@@ -19,7 +19,6 @@
19 19
 #include "unwarmmem.h"
20 20
 #include "unwarm.h"
21 21
 
22
-
23 22
 #define M_IsIdxUsed(a, v) (((a)[v >> 3] & (1 << (v & 0x7))) ? true : false)
24 23
 #define M_SetIdxUsed(a, v) ((a)[v >> 3] |= (1 << (v & 0x7)))
25 24
 #define M_ClrIdxUsed(a, v) ((a)[v >> 3] &= ~(1 << (v & 0x7)))
@@ -115,4 +114,5 @@ void UnwMemHashGC(UnwState * const state) {
115 114
     }
116 115
   }
117 116
 }
118
-#endif
117
+
118
+#endif // __arm__ || __thumb__

Marlin/src/backtrace/unwarmmem.h → Marlin/src/HAL/backtrace/unwarmmem.h View File


Marlin/src/backtrace/unwinder.cpp → Marlin/src/HAL/backtrace/unwinder.cpp View File


Marlin/src/backtrace/unwinder.h → Marlin/src/HAL/backtrace/unwinder.h View File


Marlin/src/backtrace/unwmemaccess.cpp → Marlin/src/HAL/backtrace/unwmemaccess.cpp View File


Marlin/src/backtrace/unwmemaccess.h → Marlin/src/HAL/backtrace/unwmemaccess.h View File


Loading…
Cancel
Save