Skip to content

Added checkboxes to select output format and medium #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
postcode-x wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added checkboxes to select output format and medium #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bsnes/ui-qt/debugger/debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,18 @@ Debugger::Debugger() {
connect(debugSGB, SIGNAL(traceStateChanged(int)), tracer, SLOT(setSgbTraceState(int)));
connect(traceMask->defaultAction(), SIGNAL(toggled(bool)), tracer, SLOT(setTraceMaskState(bool)));

connect(debugCPU, SIGNAL(traceFormatChanged(int)), tracer, SLOT(setTraceFormat(int)));
connect(debugSMP, SIGNAL(traceFormatChanged(int)), tracer, SLOT(setTraceFormat(int)));
connect(debugSA1, SIGNAL(traceFormatChanged(int)), tracer, SLOT(setTraceFormat(int)));
connect(debugSFX, SIGNAL(traceFormatChanged(int)), tracer, SLOT(setTraceFormat(int)));
connect(debugSGB, SIGNAL(traceFormatChanged(int)), tracer, SLOT(setTraceFormat(int)));

connect(debugCPU, SIGNAL(traceMediumChanged(int)), tracer, SLOT(setTraceMedium(int)));
connect(debugSMP, SIGNAL(traceMediumChanged(int)), tracer, SLOT(setTraceMedium(int)));
connect(debugSA1, SIGNAL(traceMediumChanged(int)), tracer, SLOT(setTraceMedium(int)));
connect(debugSFX, SIGNAL(traceMediumChanged(int)), tracer, SLOT(setTraceMedium(int)));
connect(debugSGB, SIGNAL(traceMediumChanged(int)), tracer, SLOT(setTraceMedium(int)));

frameCounter = 0;
synchronize();
resize(855, 745);
Expand Down
14 changes: 14 additions & 0 deletions bsnes/ui-qt/debugger/debuggerview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@ DebuggerView::DebuggerView(RegisterEdit *registers, DisasmProcessor *processor,
traceProcessor = new QCheckBox("Trace");
controlLayout->addWidget(traceProcessor);

traceFormat = new QCheckBox("Text Output");
controlLayout->addWidget(traceFormat);

traceMedium = new QCheckBox("Socket Output");
controlLayout->addWidget(traceMedium);

// Text output
traceFormat->setChecked(false);

// Socket output
traceMedium->setChecked(true);

if (processor->getSymbols() != NULL) {
symbolsViewerDialog = new SymbolsView(processor);
symbolsViewer = new QPushButton("Symbols");
Expand All @@ -67,6 +79,8 @@ DebuggerView::DebuggerView(RegisterEdit *registers, DisasmProcessor *processor,

connect(stepProcessor, SIGNAL(clicked(bool)), this, SLOT(synchronize()));
connect(traceProcessor, SIGNAL(stateChanged(int)), this, SIGNAL(traceStateChanged(int)));
connect(traceFormat, SIGNAL(stateChanged(int)), this, SIGNAL(traceFormatChanged(int)));
connect(traceMedium, SIGNAL(stateChanged(int)), this, SIGNAL(traceMediumChanged(int)));

connect(consoleLayout, SIGNAL(splitterMoved(int,int)), this, SLOT(synchronize()));

Expand Down
4 changes: 4 additions & 0 deletions bsnes/ui-qt/debugger/debuggerview.moc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ class DebuggerView : public QWidget {
QVBoxLayout *controlLayout;
QCheckBox *stepProcessor;
QCheckBox *traceProcessor;
QCheckBox *traceFormat;
QCheckBox *traceMedium;
QPushButton *symbolsViewer;
class QHexEdit *ramViewer;
class SymbolsView *symbolsViewerDialog;
Expand All @@ -26,6 +28,8 @@ public slots:
signals:
void synchronized();
void traceStateChanged(int);
void traceFormatChanged(int);
void traceMediumChanged(int);

protected:
void resizeEvent(QResizeEvent*);
Expand Down
32 changes: 20 additions & 12 deletions bsnes/ui-qt/debugger/tracer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@ Tracer *tracer;

#include "w32_socket.cpp"

// TODO: demo only: make these checkboxes in the UI or config options

// tracer output info format
// false: binary format (small/faster),
// true: text format (easier to parse / but slower and HUGE))
const bool traceOutputFormatIsText = false;

// where trace output will be sent
// true: listen on a socket port and stream data to a client
// false: output via a logfile on disk
const bool traceOutputMediumIsSocket = true;

#define DEFAULT_TRACE_SERVER_LISTEN_PORT "27015"

void Tracer::outputTrace(const char* buf, int len) {
Expand Down Expand Up @@ -230,6 +218,16 @@ void Tracer::setTraceMaskState(bool state) {
}
}

// Trace format & medium

void Tracer::setTraceFormat(int state) {
traceOutputFormatIsText = (state == Qt::Checked);
}

void Tracer::setTraceMedium(int state) {
traceOutputMediumIsSocket = (state == Qt::Checked);
}

Tracer::Tracer() {
traceCpu = false;
traceSmp = false;
Expand All @@ -238,6 +236,16 @@ Tracer::Tracer() {
traceSgb = false;
traceMask = false;

// tracer output info format
// false: binary format (small/faster),
// true: text format (easier to parse / but slower and HUGE))
traceOutputFormatIsText = false;

// where trace output will be sent
// true: listen on a socket port and stream data to a client
// false: output via a logfile on disk
traceOutputMediumIsSocket = true;

traceMaskCPU = new uint8_t[(1 << 24) >> 3]();
traceMaskSMP = new uint8_t[(1 << 16) >> 3]();
traceMaskSA1 = new uint8_t[(1 << 24) >> 3]();
Expand Down
6 changes: 6 additions & 0 deletions bsnes/ui-qt/debugger/tracer.moc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public slots:

void flushTraceOutput();

void setTraceFormat(int);
void setTraceMedium(int);

private:
void setTraceState(bool);

Expand All @@ -38,6 +41,9 @@ public slots:
bool traceSgb;
bool traceMask;

bool traceOutputFormatIsText;
bool traceOutputMediumIsSocket;

uint8_t *traceMaskCPU;
uint8_t *traceMaskSMP;
uint8_t *traceMaskSA1;
Expand Down