From 777ad1471bce478d368a24fa4299ef00477f3969 Mon Sep 17 00:00:00 2001
From: Sergey <serge@vak.ru>
Date: Sat, 3 May 2014 01:28:48 -0700
Subject: [PATCH] Smlrc: option -v moved to target-dependent part. Fixed bug in
 simulator: read from incorrect file descriptor when the second SD card not
 configured.

---
 src/cmd/smlrc/cgmips.c         | 4 ++++
 src/cmd/smlrc/smlrc.c          | 4 ----
 tools/virtualmips/dev_sdcard.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/cmd/smlrc/cgmips.c b/src/cmd/smlrc/cgmips.c
index 9f75376..edc7e03 100644
--- a/src/cmd/smlrc/cgmips.c
+++ b/src/cmd/smlrc/cgmips.c
@@ -63,6 +63,10 @@ int GenInitParams(int argc, char** argv, int* idx)
     UseGp = 1;
     return 1;
   }
+  else if (!strcmp(argv[*idx], "-v"))
+  {
+    return 1;
+  }
   return 0;
 }
 
diff --git a/src/cmd/smlrc/smlrc.c b/src/cmd/smlrc/smlrc.c
index 977fc13..d65021a 100644
--- a/src/cmd/smlrc/smlrc.c
+++ b/src/cmd/smlrc/smlrc.c
@@ -7593,10 +7593,6 @@ int main(int argc, char** argv)
       verbose = 1;
       continue;
     }
-    else if (!strcmp(argv[i], "-v"))
-    {
-      continue;
-    }
 #ifndef NO_PREPROCESSOR
     else if (!strcmp(argv[i], "-I"))
     {
diff --git a/tools/virtualmips/dev_sdcard.c b/tools/virtualmips/dev_sdcard.c
index 38fd9b0..478cbac 100644
--- a/tools/virtualmips/dev_sdcard.c
+++ b/tools/virtualmips/dev_sdcard.c
@@ -140,7 +140,7 @@ unsigned dev_sdcard_io (cpu_mips_t *cpu, unsigned data)
                   pic32->sdcard[1].select ? &pic32->sdcard[1] : 0;
     unsigned reply;
 
-    if (! d) {
+    if (! d || ! d->fd) {
         TRACE ("sdcard: unselected i/o\n");
         return 0xFF;
     }