| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 * Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 /* Implement the ApplyValidatorVerbosely API for the x86-64 architecture. */ | 7 /* Implement the ApplyValidatorVerbosely API for the x86-64 architecture. */ |
| 8 | 8 |
| 9 #include "native_client/src/trusted/validator/ncvalidate.h" | 9 #include "native_client/src/trusted/validator/ncvalidate.h" |
| 10 | 10 |
| 11 #include "native_client/src/shared/platform/nacl_log.h" | 11 #include "native_client/src/shared/platform/nacl_log.h" |
| 12 #include "native_client/src/trusted/validator/x86/nacl_cpuid.h" | 12 #include "native_client/src/trusted/cpu_features/arch/x86/cpu_x86.h" |
| 13 #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/ncvalidate_iter.
h" | 13 #include "native_client/src/trusted/validator/x86/ncval_reg_sfi/ncvalidate_iter.
h" |
| 14 #include "native_client/src/trusted/validator/x86/ncval_seg_sfi/ncdecode_verbose
.h" | 14 #include "native_client/src/trusted/validator/x86/ncval_seg_sfi/ncdecode_verbose
.h" |
| 15 #include "native_client/src/trusted/validator/x86/64/ncvalidate.h" | 15 #include "native_client/src/trusted/validator/x86/64/ncvalidate.h" |
| 16 #include <assert.h> | 16 #include <assert.h> |
| 17 | 17 |
| 18 /* Be sure the correct compile flags are defined for this. */ | 18 /* Be sure the correct compile flags are defined for this. */ |
| 19 #if NACL_ARCH(NACL_TARGET_ARCH) != NACL_x86 | 19 #if NACL_ARCH(NACL_TARGET_ARCH) != NACL_x86 |
| 20 # error("Can't compile, target is for x86-64") | 20 # error("Can't compile, target is for x86-64") |
| 21 #else | 21 #else |
| 22 # if NACL_TARGET_SUBARCH != 64 | 22 # if NACL_TARGET_SUBARCH != 64 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 52 const NaClCPUFeatures *f) { | 52 const NaClCPUFeatures *f) { |
| 53 /* TODO(jfb) Use a safe cast here. */ | 53 /* TODO(jfb) Use a safe cast here. */ |
| 54 const NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f; | 54 const NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f; |
| 55 | 55 |
| 56 if (!NaClArchSupportedX86(cpu_features)) | 56 if (!NaClArchSupportedX86(cpu_features)) |
| 57 return NaClValidationFailedCpuNotSupported; | 57 return NaClValidationFailedCpuNotSupported; |
| 58 | 58 |
| 59 return NaClApplyValidatorVerbosely_x86_64( | 59 return NaClApplyValidatorVerbosely_x86_64( |
| 60 guest_addr, data, size, f); | 60 guest_addr, data, size, f); |
| 61 } | 61 } |
| OLD | NEW |