# HG changeset patch
# User jcdutton
# Date 1049561145 0
# Node ID 840e99bfb57d47e0a519818eb9f01b3232496b99
# Parent  3492d41dc24771809f2c3d35e3e716a09b0d9e91
Some updates from ifodump at dvd.sf.net

diff -r 3492d41dc247 -r 840e99bfb57d vmcmd.c
--- a/vmcmd.c	Sat Apr 05 14:28:07 2003 +0000
+++ b/vmcmd.c	Sat Apr 05 16:45:45 2003 +0000
@@ -187,7 +187,7 @@
   
   if(op) {
     fprintf(MSG_OUT, "if (");
-    print_reg(vm_getbits(command,39,8));
+    print_g_reg(vm_getbits(command,39,8));
     print_cmp_op(op);
     print_reg_or_data(command, vm_getbits(command, 55,1), 31);
     fprintf(MSG_OUT, ") ");
@@ -211,7 +211,7 @@
   
   if(op) {
     fprintf(MSG_OUT, "if (");
-    print_reg(vm_getbits(command, 43, 4));
+    print_g_reg(vm_getbits(command, 43, 4));
     print_cmp_op(op);
     print_reg_or_data(command, vm_getbits(command, 55, 1), 15);
     fprintf(MSG_OUT, ") ");
@@ -275,7 +275,7 @@
 }
 
 static void print_linksub_instruction(command_t* command) {
-  int linkop = vm_getbits(command, 4, 5);
+  int linkop = vm_getbits(command, 7, 8);
   int button = vm_getbits(command, 15, 6);
   
   if(linkop < sizeof(link_table)/sizeof(char *) && link_table[linkop] != NULL)
@@ -343,7 +343,7 @@
           break;
         case 2:
           fprintf(MSG_OUT, "JumpSS VTSM (vts %" PRIu8 ", title %" PRIu8 
-		  ", menu %" PRIu8 ")", vm_getbits(command, 31, 8), vm_getbits(command, 39, 8), vm_getbits(command, 19, 4));
+		  ", menu %" PRIu8 ")", vm_getbits(command, 30, 7), vm_getbits(command, 38, 7), vm_getbits(command, 19, 4));
           break;
         case 3:
           fprintf(MSG_OUT, "JumpSS VMGM (pgc %" PRIu8 ")", vm_getbits(command, 46, 15));
@@ -377,11 +377,13 @@
 
 static void print_system_set(command_t* command) {
   int i;
+/* FIXME: What about SPRM11 ? Karaoke */
+/*        Surely there must be some system set command for that ? */
   
   switch(vm_getbits(command, 59, 4)) {
     case 1: /*  Set system reg 1 &| 2 &| 3 (Audio, Subp. Angle) */
       for(i = 1; i <= 3; i++) {
-        if(vm_getbits(command, 63 - ((2+i)*8), 1)) {
+        if(vm_getbits(command, 47 - (i*8), 1)) {
           print_system_reg(i);
           fprintf(MSG_OUT, " = ");
           print_reg_or_data_2(command, vm_getbits(command, 60, 1), 47 - (i*8) );
@@ -395,7 +397,7 @@
       print_reg_or_data(command, vm_getbits(command, 60, 1), 47);
       fprintf(MSG_OUT, " ");
       print_system_reg(10);
-      fprintf(MSG_OUT, " = %" PRIu8, vm_getbits(command, 23, 8)); /*  ?? */
+      fprintf(MSG_OUT, " = %" PRIu16, vm_getbits(command, 30, 15)); /*  ?? */
       break;
     case 3: /*  Mode: Counter / Register + Set */
       fprintf(MSG_OUT, "SetMode ");
@@ -403,7 +405,7 @@
 	fprintf(MSG_OUT, "Counter ");
       else
 	fprintf(MSG_OUT, "Register ");
-      print_reg(vm_getbits(command, 19, 4));
+      print_g_reg(vm_getbits(command, 19, 4));
       print_set_op(0x1); /*  '=' */
       print_reg_or_data(command, vm_getbits(command, 60, 1), 47);
       break;
@@ -424,7 +426,7 @@
   uint8_t set_op = vm_getbits(command, 59, 4);
   
   if(set_op) {
-    print_reg(vm_getbits(command, 39, 8));  /* FIXME: This is different from decoder.c!!!  */
+    print_g_reg(vm_getbits(command, 35, 4));
     print_set_op(set_op);
     print_reg_or_data(command, vm_getbits(command, 60, 1), 31);
   } else {
@@ -436,7 +438,7 @@
   uint8_t set_op = vm_getbits(command, 59, 4);
   
   if(set_op) {
-    print_reg(vm_getbits(command, 51, 4));
+    print_g_reg(vm_getbits(command, 51, 4));
     print_set_op(set_op);
     print_reg_or_data(command, vm_getbits(command, 60, 1), 47);
   } else {
@@ -448,7 +450,7 @@
   uint8_t set_op = vm_getbits(command, 59, 4);
   
   if(set_op) {
-    print_reg(vm_getbits(command, 51, 4));
+    print_g_reg(vm_getbits(command, 51, 4));
     print_set_op(set_op);
     print_reg_or_data_3(command, vm_getbits(command, 60, 1), 47);
   } else {