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

diff --git a/palacios/src/palacios/vmm_decoder.c b/palacios/src/palacios/vmm_decoder.c
index 9b8d91e..10fb2dc 100644
--- a/palacios/src/palacios/vmm_decoder.c
+++ b/palacios/src/palacios/vmm_decoder.c
@@ -1,34 +1,30 @@
 #include <palacios/vmm_decoder.h>
 
 
-
-/* The full blown instruction parser... */
-int v3_parse_instr(struct guest_info * info,
-		   char * instr_ptr,
-		   uint_t * instr_length, 
-		   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);
-
-  
-  // Ignore prefixes for now
-  while (is_prefix_byte(*instr)) {
-    instr++;
-    *instr_length++;
+int opcode_cmp(const uchar_t * op1, const uchar_t * op2) {
+  if (op1[0] != op2[0]) {
+    return op1[0] - op2[0];;
+  } else {
+    return memcmp(op1 + 1, op2 + 1, op1[0]);
   }
+}
 
 
-  // Opcode table lookup, see xen/kvm
-
-
-
-
-
-  return 0;
+void strip_rep_prefix(uchar_t * instr, int length) {
+  int read_ctr = 0;
+  int write_ctr = 0;
+  int found = 0;
+
+  while (read_ctr < length) {
+    if ((!found) && 
+	( (instr[read_ctr] == 0xF2) ||
+	  (instr[read_ctr] == 0xF3))) {
+      read_ctr++;
+      found = 1;
+    } else {
+      instr[write_ctr] = instr[read_ctr];
+      write_ctr++;
+      read_ctr++;
+    }
+  }
 }