aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/driver.cc3
-rw-r--r--kernel/mem.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/kernel/driver.cc b/kernel/driver.cc
index 7690c2ed2..f8f940e89 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -370,6 +370,7 @@ int main(int argc, char **argv)
exit(0);
case 'S':
passes_commands.push_back("synth");
+ run_shell = false;
break;
case 'g':
log_force_debug++;
@@ -382,9 +383,11 @@ int main(int argc, char **argv)
break;
case 'H':
passes_commands.push_back("help");
+ run_shell = false;
break;
case 'h':
passes_commands.push_back(stringf("help %s", optarg));
+ run_shell = false;
break;
case 'b':
backend_command = optarg;
diff --git a/kernel/mem.cc b/kernel/mem.cc
index 746f667ea..96168ff76 100644
--- a/kernel/mem.cc
+++ b/kernel/mem.cc
@@ -985,7 +985,8 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
c = ff.emit();
}
- log("Extracted %s FF from read port %d of %s.%s: %s\n", trans_use_addr ? "addr" : "data",
+ if (c)
+ log("Extracted %s FF from read port %d of %s.%s: %s\n", trans_use_addr ? "addr" : "data",
idx, log_id(module), log_id(memid), log_id(c));
port.en = State::S1;