Start unit testing for functions in nc_inst_state.c

src/trusted/validator_x86/ncdis_util.c

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * ncdis.c - disassemble using NaCl decoder.
  * Mostly for testing.
  */
 
 
 #ifndef NACL_TRUSTED_BUT_NOT_TCB
 #error("This file is not meant for use in the TCB")
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "native_client/src/trusted/validator_x86/ncdecode.h"
 #include "gen/native_client/src/trusted/validator_x86/ncdisasmtab.h"
-
+#include "native_client/src/trusted/validator_x86/RexPrefixes.h"
 
 /* To turn on debugging of instruction decoding, change value of
  * DEBUGGING to 1.
  */
 #define DEBUGGING 0
 
 #include "native_client/src/shared/utils/debugging.h"
 
 /* The following are conditionally added since they only have meaning
  * if we are processing 64-bit instructions.
  */
 #if NACL_TARGET_SUBARCH == 64
 
 /* Returns if the decoded instruction contains a REX prefix byte. */
 static INLINE uint8_t HasRexPrefix(const NCDecoderInst* dinst) {
   /* Note: we could check the prefix mask of the recognized instruction to
    * see if bit kPrefixREX is set. However, the field rexprefix is
    * initialized to zero (during decoding) and only set if an actual
    * REX prefix is found (which must be values between 0x40 and 0x4f)
    */
   return 0 != dinst->inst.rexprefix;
 }
 
 /* Returns true if REX.W is defined in the REX prefix byte. */
 static INLINE uint8_t GetRexPrefixW(const NCDecoderInst* dinst) {
   /* Note: the field rexprefix is non-zero only if a rexprefix was found. */
-  return 0 != (dinst->inst.rexprefix & 0x8);
+  return 0 != NaClRexW(dinst->inst.rexprefix);
 }
 
 /* Returns true if REX.R is defined in the REX prefix byte. */
 static INLINE uint8_t GetRexPrefixR(const NCDecoderInst* dinst) {
   /* Note: the field rexprefix is non-zero only if a rexprefix was found. */
-  return 0 != (dinst->inst.rexprefix & 0x4);
+  return 0 != NaClRexR(dinst->inst.rexprefix);
 }
 
 /* Returns true if REX.X is defined in the REX prefix byte. */
 static INLINE uint8_t GetRexPrefixX(const NCDecoderInst* dinst) {
   /* Note: the field rexprefix is non-zero only if a rexprefix was found. */
-  return 0 != (dinst->inst.rexprefix & 0x2);
+  return 0 != NaClRexX(dinst->inst.rexprefix);
 }
 
 /* Returns true if REX.B is defined in the REX prefix byte. */
 static INLINE uint8_t GetRexPrefixB(const NCDecoderInst* dinst) {
   /* Note: the field rexprefix is non-zero only if a rexprefix was found. */
-  return 0 != (dinst->inst.rexprefix & 0x1);
+  return 0 != NaClRexB(dinst ->inst.rexprefix);
 }
+
 #endif
 
 /* Returns the index into the general purpose registers based on the
  * value in the modrm.rm field of the instruction (taking into account
  * the REX prefix if it appears).
  */
 static INLINE uint32_t state_modrm_reg(const NCDecoderInst* dinst) {
   /* TODO(karl) This is no where near close to being correct. Currently,
    * It only models r/m64 entry for instructions in the Intel documentation,
    * which requires the W bit to be set (r/m32 entries do not use REX.w,
@@ skipping 497 matching lines @@
   for (i = dinst->inst.bytes.length; i < 7; i++) fprintf(fp, "   ");
   fprintf(fp, "\t");
   InstFormat(DisFmt(dinst), dinst, fp);
   fprintf(fp, "\n");
 }
 
 
 void PrintInstStdout(const NCDecoderInst *dinst) {
   PrintInst(dinst, stdout);
 }