# HG changeset patch
# User jcdutton
# Date 1049548273 0
# Node ID 175d5fef21e4f01c3b6aec46355449767a716ba0
# Parent  3a1659f4a6c37ffc252e7ca645c180fdcb6fc252
Minor changes.

diff -r 3a1659f4a6c3 -r 175d5fef21e4 decoder.c
--- a/decoder.c	Sat Apr 05 09:18:12 2003 +0000
+++ b/decoder.c	Sat Apr 05 13:11:13 2003 +0000
@@ -34,30 +34,6 @@
 #include <assert.h>
 #include "dvdnav_internal.h"
 
-uint32_t vm_getbits(command_t *command, int start, int count) {
-  uint64_t result = 0;
-  uint64_t bit_mask=0xffffffffffffffff;  /* I could put -1 instead */
-  uint64_t examining = 0;
-  int32_t  bits;
-
-  if (count == 0) return 0;
-
-  if ( ((start - count) < -1) ||
-       (count > 32) ||
-       (start > 63) ||
-       (count < 0) ||
-       (start < 0) ) {
-    fprintf(MSG_OUT, "libdvdnav: Bad call to vm_getbits. Parameter out of range\n");
-    assert(0);
-  }
-  bit_mask >>= 63 - start;
-  bits = start + 1 - count;
-  examining = ((bit_mask >> bits) << bits );
-  command->examined |= examining;
-  result = (command->instruction & bit_mask) >> bits;
-  return (uint32_t) result;
-}
-
 static uint16_t get_GPRM(registers_t* registers, uint8_t reg) {
   if (registers->GPRM_mode[reg] & 0x01) {
     struct timeval current_time, time_offset;
@@ -580,10 +556,10 @@
 #ifdef TRACE
   /*  DEBUG */
   fprintf(MSG_OUT, "libdvdnav: Registers before transaction\n");
-  vmPrint_registers( registers );
+  vm_print_registers( registers );
   fprintf(MSG_OUT, "libdvdnav: Full list of commands to execute\n");
   for(i = 0; i < num_commands; i++)
-    vmPrint_CMD(i, &commands[i]);
+    vm_print_cmd(i, &commands[i]);
   fprintf(MSG_OUT, "libdvdnav: --------------------------------------------\n");
   fprintf(MSG_OUT, "libdvdnav: Single stepping commands\n");
 #endif
@@ -593,7 +569,7 @@
     int32_t line;
     
 #ifdef TRACE
-    vmPrint_CMD(i, &commands[i]);
+    vm_print_cmd(i, &commands[i]);
 #endif
 
     line = eval_command(&commands[i].bytes[0], registers, return_values);
@@ -601,7 +577,7 @@
     if (line < 0) { /*  Link command */
 #ifdef TRACE
       fprintf(MSG_OUT, "libdvdnav: Registers after transaction\n");
-      vmPrint_registers( registers );
+      vm_print_registers( registers );
       fprintf(MSG_OUT, "libdvdnav: eval: Doing Link/Jump/Call\n"); 
 #endif
       return 1;
@@ -618,7 +594,7 @@
   memset(return_values, 0, sizeof(link_t));
 #ifdef TRACE
   fprintf(MSG_OUT, "libdvdnav: Registers after transaction\n");
-  vmPrint_registers( registers );
+  vm_print_registers( registers );
 #endif
   return 0;
 }
@@ -691,7 +667,7 @@
   return "*** (bug)";
 }
 
-void vmPrint_LINK(link_t value) {
+void vm_print_link(link_t value) {
   char *cmd = linkcmd2str(value.command);
     
   switch(value.command) {
@@ -747,7 +723,7 @@
   }
  }
 
-void vmPrint_registers( registers_t *registers ) {
+void vm_print_registers( registers_t *registers ) {
   int32_t i;
   fprintf(MSG_OUT, "libdvdnav:    #   ");
   for(i = 0; i < 24; i++)
diff -r 3a1659f4a6c3 -r 175d5fef21e4 decoder.h
--- a/decoder.h	Sat Apr 05 09:18:12 2003 +0000
+++ b/decoder.h	Sat Apr 05 13:11:13 2003 +0000
@@ -109,10 +109,10 @@
 
 #ifdef TRACE
 /* for debugging: prints a link in readable form */
-void vmPrint_LINK(link_t value);
+void vm_print_link(link_t value);
 
 /* for debugging: dumps VM registers */
-void vmPrint_registers( registers_t *registers );
+void vm_print_registers( registers_t *registers );
 #endif
 
 #endif /* DECODER_H_INCLUDED */
diff -r 3a1659f4a6c3 -r 175d5fef21e4 highlight.c
--- a/highlight.c	Sat Apr 05 09:18:12 2003 +0000
+++ b/highlight.c	Sat Apr 05 13:11:13 2003 +0000
@@ -175,7 +175,7 @@
           fprintf(MSG_OUT, "libdvdnav: %02x ", btni->cmd.bytes[k]);
         }
         fprintf(MSG_OUT, "| ");
-        vmPrint_mnemonic(&btni->cmd);
+        vm_print_mnemonic(&btni->cmd);
         fprintf(MSG_OUT, "\n");
       }
     }
diff -r 3a1659f4a6c3 -r 175d5fef21e4 vm.c
--- a/vm.c	Sat Apr 05 09:18:12 2003 +0000
+++ b/vm.c	Sat Apr 05 13:11:13 2003 +0000
@@ -1172,7 +1172,7 @@
     
 #ifdef TRACE
     fprintf(MSG_OUT, "libdvdnav: Before printout starts:\n");
-    vmPrint_LINK(link_values);
+    vm_print_link(link_values);
     fprintf(MSG_OUT, "libdvdnav: Link values %i %i %i %i\n", link_values.command, 
 	    link_values.data1, link_values.data2, link_values.data3);
     vm_print_current_domain_state(vm);
@@ -1818,6 +1818,9 @@
 
 /*
  * $Log$
+ * Revision 1.53  2003/04/05 13:11:13  jcdutton
+ * Minor changes.
+ *
  * Revision 1.52  2003/04/03 12:48:30  mroi
  * merge James changes from xine-lib cvs
  *
diff -r 3a1659f4a6c3 -r 175d5fef21e4 vmcmd.c
--- a/vmcmd.c	Sat Apr 05 09:18:12 2003 +0000
+++ b/vmcmd.c	Sat Apr 05 13:11:13 2003 +0000
@@ -115,21 +115,6 @@
   NULL,
 };
 
-typedef struct {
-  uint16_t SPRM[24];
-  uint16_t GPRM[16];
-  uint8_t  GPRM_mode[16];  /* Need to have some thing to indicate normal/counter mode for every
-GPRM */
-  struct timeval GPRM_time[16]; /* For counter mode */
-} registers_t;
-
-typedef struct
-{
-  uint64_t instruction;
-  uint64_t examined;
-  registers_t *registers;
-} command_t;
-
 uint32_t vm_getbits(command_t *command, int start, int count) {
   uint64_t result = 0;
   uint64_t bit_mask=0xffffffffffffffff;  /* I could put -1 instead */
@@ -564,7 +549,7 @@
   }
 }
 
-void vmPrint_CMD(int row, vm_cmd_t *vm_command) {
+void vm_print_cmd(int row, vm_cmd_t *vm_command) {
   int i;
 
   fprintf(MSG_OUT, "(%03d) ", row + 1);
@@ -572,7 +557,7 @@
     fprintf(MSG_OUT, "%02x ", vm_command->bytes[i]);
   fprintf(MSG_OUT, "| ");
 
-  vmPrint_mnemonic(vm_command);
+  vm_print_mnemonic(vm_command);
   fprintf(MSG_OUT, "\n");
 }
 
diff -r 3a1659f4a6c3 -r 175d5fef21e4 vmcmd.h
--- a/vmcmd.h	Sat Apr 05 09:18:12 2003 +0000
+++ b/vmcmd.h	Sat Apr 05 13:11:13 2003 +0000
@@ -30,8 +30,8 @@
 #include "dvdnav_internal.h"
 
 #ifdef TRACE
-void vmPrint_mnemonic(vm_cmd_t *command);
-void vmPrint_CMD(int row, vm_cmd_t *command);
+void vm_print_mnemonic(vm_cmd_t *command);
+void vm_print_cmd(int row, vm_cmd_t *command);
 #endif
 
 #endif /* VMCMD_H_INCLUDED */