Merge branch 'master' into cc-use-smallerc

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;
 }
 

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"))
     {

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;
     }