Commit 6ce87fb1 authored by Wesley W. Terpstra's avatar Wesley W. Terpstra

Connect gdb

parent 01f043cb
......@@ -45,7 +45,7 @@ int main() {
Map dev0_r(&ic, 32, true);
Arbiter lm32_w(&ic, false);
Arbiter lm32_rw(&ic, true);
Arbiter lm32_r(&ic, true);
LM32Break lm32break(&ic);
LM32Reboot lm32reboot(&ic);
LM32Write lm32write(&ic, false);
......@@ -55,7 +55,6 @@ int main() {
GDB_Serial gdb_serial(&ic);
SlavePort& uart = ic.head().addControl(uint8_pinout, (void*)0, &got).port();
SlavePort& reboot = ic.head().addControl().port();
try {
ic.configure()
......@@ -69,24 +68,22 @@ int main() {
.connect(dev0_r.data, rabbit.read)
.connect(lm32_w.slave, dev0_w.addRegister(0x70000).port())
.connect(lm32_rw.slave, dev0_r.addRegister(0x70000).port())
.connect(lm32_r.slave, dev0_r.addRegister(0x70000).port())
.connect(lm32break.lm32_write, lm32_w.addClient().port())
.connect(lm32break.lm32_read_write, lm32_rw.addClient().port())
.connect(lm32break.lm32_read, lm32_r.addClient().port())
.connect(lm32reboot.lm32_write, lm32_w.addClient().port())
.connect(lm32reboot.lm32_read_write, lm32_rw.addClient().port())
.connect(lm32reboot.lm32_read, lm32_r.addClient().port())
.connect(lm32write.lm32_write, lm32_w.addClient().port())
.connect(lm32write.lm32_read_write, lm32_rw.addClient().port())
.connect(lm32write.lm32_read, lm32_r.addClient().port())
.connect(lm32read.lm32_write, lm32_w.addClient().port())
.connect(lm32read.lm32_read_write, lm32_rw.addClient().port())
.connect(lm32read.lm32_read, lm32_r.addClient().port())
.connect(lm32drom.echo, echos.addClient().port())
.connect(lm32drom.uart_write, lm32write.write)
.connect(lm32drom.uart_read, lm32read.read)
.connect(lm32drom.uart_poll, lm32read.poll)
.connect(lm32drom.jtag_break, lm32break.execute)
.connect(reboot, lm32reboot.execute)
/*
.connect(gdb_rsp.echo, echos.addClient().port())
.connect(gdb_rsp.register_address, lm32drom.register_address)
.connect(gdb_rsp.register_write, lm32drom.register_write)
......@@ -101,7 +98,6 @@ int main() {
.connect(gdb_serial.echo, echos.addClient().port())
.connect(gdb_serial.packet, gdb_rsp.packet)
.connect(uart, gdb_serial.uart)
*/
;
} catch (const BadConnection& bc) {
std::cerr << bc;
......@@ -111,13 +107,10 @@ int main() {
try {
ic.reset();
ic.execute();
reboot();
ic.execute();
} catch (const ProtocolViolation& v) {
std::cerr << v;
return -1;
}
return 0;
drom = &lm32drom;
signal(SIGINT, &trapSIGINT);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment