X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_decoder.c;h=77ece9b1a93d001e676d5e3ead50937d5ff12379;hb=d35c92b5c9c5aef7b1e7b5ed500b2beae504ea4e;hp=9b8d91e4a55a34d32cb95e2034945e2084f74a5d;hpb=e6b4a2f11bae0faac9faedec12422385dcc39593;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_decoder.c b/palacios/src/palacios/vmm_decoder.c
index 9b8d91e..77ece9b 100644
--- a/palacios/src/palacios/vmm_decoder.c
+++ b/palacios/src/palacios/vmm_decoder.c
@@ -6,20 +6,23 @@
 int v3_parse_instr(struct guest_info * info,
 		   char * instr_ptr,
 		   uint_t * instr_length, 
+		   addr_t * opcode,
+		   uint_t * opcode_length,
+		   struct x86_prefix_list * prefixes,
 		   struct x86_operand * src_operand,
 		   struct x86_operand * dst_operand,
 		   struct x86_operand * extra_operand) {
 
-  V3_Assert(src_operand != NULL);
-  V3_Assert(dst_operand != NULL);
-  V3_Assert(extra_operand != NULL);
-  V3_Assert(instr_length != NULL);
-  V3_Assert(info != NULL);
+  V3_ASSERT(src_operand != NULL);
+  V3_ASSERT(dst_operand != NULL);
+  V3_ASSERT(extra_operand != NULL);
+  V3_ASSERT(instr_length != NULL);
+  V3_ASSERT(info != NULL);
 
   
   // Ignore prefixes for now
-  while (is_prefix_byte(*instr)) {
-    instr++;
+  while (is_prefix_byte(*instr_ptr)) {
+    instr_ptr++;
     *instr_length++;
   }