From 3e75adb07c714b6bdd0f53d280ff40250a72858c Mon Sep 17 00:00:00 2001
From: Makise Kurisu <kurisu@shimatta.de>
Date: Thu, 9 Apr 2015 08:54:02 +0200
Subject: [PATCH] -gtkwave -> args for gtkwave; -rargs -> args when running the
 program

---
 vsim/main.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vsim/main.cpp b/vsim/main.cpp
index 224ecc7..5f8618a 100644
--- a/vsim/main.cpp
+++ b/vsim/main.cpp
@@ -95,6 +95,7 @@ int main(int argc, char **argv) {
     string simtime = "";
     string ghdlargs = "";
     string wvargs = "";
+    string gtkargs = "";
     int i;
     char tempdir[256] = ""; // Compile dir
 
@@ -113,9 +114,12 @@ int main(int argc, char **argv) {
         else if (GETOPT("-ghdl")) {
             ghdlargs = argv[i];
         }
-        else if (GETOPT("-gtkwave")) {
+        else if (GETOPT("-rargs")) {
             wvargs = argv[i];
         }
+        else if (GETOPT("-gtkwave")) {
+            gtkargs = argv[i];
+        }
         else {
             if (argv[i][0] == '-') {
                 cerr << "INFO: Unknown command line opt: " << argv[i] << endl;
@@ -184,7 +188,7 @@ int main(int argc, char **argv) {
                 }
                 else {
                     cout << "==> All done!" << endl;
-                    string wv = "gtkwave " + string(tempdir) + "/" + top + ".ghw &";
+                    string wv = "gtkwave " + string(tempdir) + "/" + top + ".ghw " + gtkargs + " &";
                     if (run("pidof gtkwave")) {
                         if (system(wv.c_str())) {
                             cerr << "Error: GtkWave failed.";