Skip to content

Commit f82f2ab

Browse files
tolauwaetolauwae
committed
Format + Add missing #include
1 parent 4aaaf31 commit f82f2ab

File tree

4 files changed

+54
-60
lines changed

4 files changed

+54
-60
lines changed

‎src/Debug/debugger.cpp

+49-52
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#include "debugger.h"
22

3-
#include <inttypes.h>
3+
#include <unistd.h>
44

5+
#include <algorithm>
6+
#include <cinttypes>
57
#include <cstring>
6-
#include <unistd.h>
78

89
#include "../Memory/mem.h"
910
#include "../Utils//util.h"
1011
#include "../Utils/macros.h"
11-
#include "../WARDuino.h"
1212

1313
// Debugger
1414

@@ -180,8 +180,8 @@ bool Debugger::checkDebugMessages(Module *m, RunningState *program_state) {
180180
break;
181181
case interruptOffset: {
182182
free(interruptData);
183-
printf("here");
184-
dprintf(this->socket, "\"{\"offset\":\"%p\"}\"\n", (void *)m->bytes);
183+
dprintf(this->socket, "\"{\"offset\":\"%p\"}\"\n",
184+
(void *)m->bytes);
185185
break;
186186
}
187187
case interruptRecvState: {
@@ -199,7 +199,7 @@ bool Debugger::checkDebugMessages(Module *m, RunningState *program_state) {
199199
free(interruptData);
200200
debug("sending %s!\n", receivingData ? "ack" : "done");
201201
dprintf(this->socket, "%s!\n", receivingData ? "ack" : "done");
202-
if(!this->receivingData){
202+
if (!this->receivingData) {
203203
debug("receiving state done\n");
204204
}
205205
}
@@ -216,37 +216,32 @@ bool Debugger::checkDebugMessages(Module *m, RunningState *program_state) {
216216
}
217217

218218
// Private methods
219-
void Debugger::printValue(StackValue *v, int idx, bool end = false){
220-
char buff[256];
221-
222-
switch (v->value_type) {
223-
case I32:
224-
snprintf(buff, 255, R"("type":"i32","value":%)" PRIi32,
225-
v->value.uint32);
226-
break;
227-
case I64:
228-
snprintf(buff, 255, R"("type":"i64","value":%)" PRIi64,
229-
v->value.uint64);
230-
break;
231-
case F32:
232-
snprintf(buff, 255, R"("type":"F32","value":%.7f)",
233-
v->value.f32);
234-
break;
235-
case F64:
236-
snprintf(buff, 255, R"("type":"F64","value":%.7f)",
237-
v->value.f64);
238-
break;
239-
default:
240-
snprintf(buff, 255,
241-
R"("type":"%02x","value":"%)" PRIx64 "\"",
242-
v->value_type, v->value.uint64);
243-
}
244-
dprintf(this->socket, R"({"idx":%d,%s}%s)", idx, buff,
245-
end ? "": ",");
219+
void Debugger::printValue(StackValue *v, int idx, bool end = false) {
220+
char buff[256];
246221

222+
switch (v->value_type) {
223+
case I32:
224+
snprintf(buff, 255, R"("type":"i32","value":%)" PRIi32,
225+
v->value.uint32);
226+
break;
227+
case I64:
228+
snprintf(buff, 255, R"("type":"i64","value":%)" PRIi64,
229+
v->value.uint64);
230+
break;
231+
case F32:
232+
snprintf(buff, 255, R"("type":"F32","value":%.7f)", v->value.f32);
233+
break;
234+
case F64:
235+
snprintf(buff, 255, R"("type":"F64","value":%.7f)", v->value.f64);
236+
break;
237+
default:
238+
snprintf(buff, 255, R"("type":"%02x","value":"%)" PRIx64 "\"",
239+
v->value_type, v->value.uint64);
240+
}
241+
dprintf(this->socket, R"({"idx":%d,%s}%s)", idx, buff, end ? "" : ",");
247242
}
248243

249-
uint8_t * Debugger::findOpcode(Module *m, Block *block){
244+
uint8_t *Debugger::findOpcode(Module *m, Block *block) {
250245
auto find =
251246
std::find_if(std::begin(m->block_lookup), std::end(m->block_lookup),
252247
[&](const std::pair<uint8_t *, Block *> &pair) {
@@ -263,7 +258,6 @@ uint8_t * Debugger::findOpcode(Module *m, Block *block){
263258
return opcode;
264259
}
265260

266-
267261
void Debugger::handleInterruptRUN(Module *m, RunningState *program_state) {
268262
dprintf(this->socket, "GO!\n");
269263
if (*program_state == WARDUINOpause && this->isBreakpoint(m->pc_ptr)) {
@@ -511,12 +505,12 @@ void Debugger::woodDump(Module *m) {
511505
size_t i = 0;
512506
for (auto bp : this->breakpoints) {
513507
dprintf(this->socket, R"("%p"%s)", bp,
514-
(++i < this->breakpoints.size()) ? "," : "");
508+
(++i < this->breakpoints.size()) ? "," : "");
515509
}
516510
dprintf(this->socket, "],");
517511

518512
// printf("asked for stack\n");
519-
//stack
513+
// stack
520514
dprintf(this->socket, "\"stack\":[");
521515
char _value_str[256];
522516
for (int i = 0; i <= m->sp; i++) {
@@ -531,7 +525,8 @@ void Debugger::woodDump(Module *m) {
531525
Frame *f = &m->callstack[i];
532526
uint8_t *block_key =
533527
f->block->block_type == 0 ? nullptr : findOpcode(m, f->block);
534-
dprintf(this->socket,
528+
dprintf(
529+
this->socket,
535530
R"({"type":%u,"fidx":"0x%x","sp":%d,"fp":%d,"block_key":"%p", "ra":"%p", "idx":%d}%s)",
536531
f->block->block_type, f->block->fidx, f->sp, f->fp, block_key,
537532
static_cast<void *>(f->ra_ptr), i, (i < m->csp) ? "," : "");
@@ -542,30 +537,31 @@ void Debugger::woodDump(Module *m) {
542537
dprintf(this->socket, "],\"globals\":[");
543538
for (uint32_t i = 0; i < m->global_count; i++) {
544539
auto v = m->globals + i;
545-
printValue(v, i, i == (m->global_count - 1));
540+
printValue(v, i, i == (m->global_count - 1));
546541
}
547542
dprintf(this->socket, "]"); // closing globals
548543

549544
// printf("asked for table\n");
550545
dprintf(this->socket, ",\"table\":{\"max\":%d, \"init\":%d, \"elements\":[",
551-
m->table.maximum, m->table.initial);
546+
m->table.maximum, m->table.initial);
552547

553-
//write(this->socket, m->table.entries, sizeof(uint32_t) * m->table.size);
548+
// write(this->socket, m->table.entries, sizeof(uint32_t) * m->table.size);
554549
dprintf(this->socket, "]}"); // closing table
555550

556551
// printf("asked for mem\n");
557552
// memory
558553
uint32_t total_elems =
559554
m->memory.pages * (uint32_t)PAGE_SIZE; // TODO debug PAGE_SIZE
560-
dprintf(this->socket, ",\"memory\":{\"pages\":%d,\"max\":%d,\"init\":%d,\"bytes\":[",
561-
m->memory.pages, m->memory.maximum, m->memory.initial);
555+
dprintf(this->socket,
556+
",\"memory\":{\"pages\":%d,\"max\":%d,\"init\":%d,\"bytes\":[",
557+
m->memory.pages, m->memory.maximum, m->memory.initial);
562558

563-
//write(this->socket, m->memory.bytes, total_elems * sizeof(uint8_t));
559+
// write(this->socket, m->memory.bytes, total_elems * sizeof(uint8_t));
564560
dprintf(this->socket, "]}"); // closing memory
565561

566-
567562
// printf("asked for br_table\n");
568-
dprintf(this->socket, ",\"br_table\":{\"size\":\"0x%x\",\"labels\":[", BR_TABLE_SIZE);
563+
dprintf(this->socket, ",\"br_table\":{\"size\":\"0x%x\",\"labels\":[",
564+
BR_TABLE_SIZE);
569565
write(this->socket, m->br_table, BR_TABLE_SIZE * sizeof(uint32_t));
570566
dprintf(this->socket, "]}}\n");
571567
}
@@ -649,10 +645,10 @@ void Debugger::freeState(Module *m, uint8_t *interruptData) {
649645
debug("max %d init %d current page %d\n", m->memory.maximum,
650646
m->memory.initial, pages);
651647
printf("max %d init %d current page %d\n", m->memory.maximum,
652-
m->memory.initial, pages);
648+
m->memory.initial, pages);
653649
// if(pages !=m->memory.pages){
654650
// if(m->memory.pages !=0)
655-
if(m->memory.bytes != nullptr){
651+
if (m->memory.bytes != nullptr) {
656652
free(m->memory.bytes);
657653
}
658654
m->memory.bytes =
@@ -687,7 +683,7 @@ bool Debugger::saveState(Module *m, uint8_t *interruptData) {
687683
switch (*program_state++) {
688684
case pcState: { // PC
689685
m->pc_ptr = (uint8_t *)readPointer(&program_state);
690-
/* printf("reciving pc %p\n", static_cast<void*>(m->pc_ptr)); */
686+
/* printf("receiving pc %p\n", static_cast<void*>(m->pc_ptr)); */
691687
break;
692688
}
693689
case breakpointsState: { // breakpoints
@@ -729,10 +725,11 @@ bool Debugger::saveState(Module *m, uint8_t *interruptData) {
729725
printf("non function block\n");
730726
uint8_t *block_key =
731727
(uint8_t *)readPointer(&program_state);
732-
/* printf("block_key=%p\n", static_cast<void *>(block_key)); */
728+
/* printf("block_key=%p\n", static_cast<void
729+
* *>(block_key)); */
733730
f->block = m->block_lookup[block_key];
734-
if(f->block == nullptr){
735-
FATAL("block_lookup cannot be nullptr\n");
731+
if (f->block == nullptr) {
732+
FATAL("block_lookup cannot be nullptr\n");
736733
}
737734
}
738735
}

‎src/Debug/debugger.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,13 @@ class Debugger {
7171

7272
bool handleChangedLocal(Module *m, uint8_t *bytes) const;
7373

74-
75-
//WOOD
74+
// WOOD
7675
bool receivingData = false;
77-
void freeState(Module *m, uint8_t * interruptData);
76+
void freeState(Module *m, uint8_t *interruptData);
7877
uint8_t *findOpcode(Module *m, Block *block);
7978
bool saveState(Module *m, uint8_t *interruptData);
8079
uintptr_t readPointer(uint8_t **data);
8180

82-
8381
public:
8482
int socket;
8583

@@ -104,7 +102,7 @@ class Debugger {
104102
void deleteBreakpoint(uint8_t *loc);
105103

106104
bool isBreakpoint(uint8_t *loc);
107-
105+
108106
// WOOD
109107
void woodDump(Module *m);
110108
};

‎src/Utils/util.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ double wa_fmin(double a, double b) {
162162
return c;
163163
}
164164

165-
166-
//WOOD
165+
// WOOD
167166
uint32_t read_B32(uint8_t **bytes) {
168167
uint8_t *b = *bytes;
169168
uint32_t n = (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + b[3];

‎src/Utils/util.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ double wa_fmax(double a, double b);
6767

6868
double wa_fmin(double a, double b);
6969

70-
//WOOD
70+
// WOOD
7171
uint32_t read_B32(uint8_t **bytes);
7272
uint16_t read_B16(uint8_t **bytes);
7373
int read_B32_signed(uint8_t **bytes);

0 commit comments

Comments
 (0)