aboutsummaryrefslogtreecommitdiffstats
path: root/ice40
diff options
context:
space:
mode:
authorZipCPU <dgisselq@ieee.org>2018-06-07 09:52:32 -0400
committerZipCPU <dgisselq@ieee.org>2018-06-07 09:52:32 -0400
commitc13c15badaaf68de6c28df44b02afc2f74eb8186 (patch)
treecd4c0ca994a7576488690c2581a3358de5a22c25 /ice40
parent1d39924c1417295c8c24598d362293f0eff2af89 (diff)
parentc352f6536b8f9eb4ad8d108e692a149348284723 (diff)
downloadnextpnr-c13c15badaaf68de6c28df44b02afc2f74eb8186.tar.gz
nextpnr-c13c15badaaf68de6c28df44b02afc2f74eb8186.tar.bz2
nextpnr-c13c15badaaf68de6c28df44b02afc2f74eb8186.zip
Set the default log to stdout
Diffstat (limited to 'ice40')
-rw-r--r--ice40/chip.h13
-rw-r--r--ice40/main.cc6
2 files changed, 17 insertions, 2 deletions
diff --git a/ice40/chip.h b/ice40/chip.h
index d107b6aa..05ef2754 100644
--- a/ice40/chip.h
+++ b/ice40/chip.h
@@ -173,12 +173,23 @@ struct BelIterator
{
int cursor;
- void operator++() { cursor++; }
+ BelIterator operator++() { cursor++; return *this; }
+ BelIterator operator++(int) {
+ BelIterator prior(*this);
+ cursor++;
+ return prior;
+ }
+
bool operator!=(const BelIterator &other) const
{
return cursor != other.cursor;
}
+ bool operator==(const BelIterator &other) const
+ {
+ return cursor == other.cursor;
+ }
+
BelId operator*() const
{
BelId ret;
diff --git a/ice40/main.cc b/ice40/main.cc
index c65013eb..68089ffb 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -26,6 +26,8 @@
#include "mainwindow.h"
#include "pybindings.h"
#include "version.h"
+#include "log.h"
+#include "place.h"
void svg_dump_el(const GraphicElement &el)
{
@@ -53,7 +55,7 @@ int main(int argc, char *argv[])
int rc = 0;
std::string str;
- log_files.push_back(stderr);
+ log_files.push_back(stdout);
po::options_description options("Allowed options");
options.add_options()("help,h", "show help");
@@ -242,6 +244,7 @@ int main(int argc, char *argv[])
std::istream *f = new std::ifstream(filename);
parse_json_file(f, filename, &design);
+ place_design(&design);
}
if (vm.count("run")) {
@@ -251,6 +254,7 @@ int main(int argc, char *argv[])
execute_python_file(filename.c_str());
}
+
if (vm.count("gui")) {
QApplication a(argc, argv);
MainWindow w;