| 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-32 architecture. */ | 7 /* Implement the ApplyValidatorVerbosely API for the x86-32 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_seg_sfi/ncvalidate_detai
led.h" | 13 #include "native_client/src/trusted/validator/x86/ncval_seg_sfi/ncvalidate_detai
led.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/ncval_seg_sfi/ncvalidate.h" | 15 #include "native_client/src/trusted/validator/x86/ncval_seg_sfi/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-32") | 20 # error("Can't compile, target is for x86-32") |
| 21 #else | 21 #else |
| 22 # if NACL_TARGET_SUBARCH != 32 | 22 # if NACL_TARGET_SUBARCH != 32 |
| (...skipping 26 matching lines...) Expand all Loading... |
| 49 size_t size, | 49 size_t size, |
| 50 const NaClCPUFeatures *f) { | 50 const NaClCPUFeatures *f) { |
| 51 /* TODO(jfb) Use a safe cast here. */ | 51 /* TODO(jfb) Use a safe cast here. */ |
| 52 const NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f; | 52 const NaClCPUFeaturesX86 *cpu_features = (NaClCPUFeaturesX86 *) f; |
| 53 if (!NaClArchSupportedX86(cpu_features)) | 53 if (!NaClArchSupportedX86(cpu_features)) |
| 54 return NaClValidationFailedCpuNotSupported; | 54 return NaClValidationFailedCpuNotSupported; |
| 55 | 55 |
| 56 return NCApplyValidatorVerbosely_x86_32( | 56 return NCApplyValidatorVerbosely_x86_32( |
| 57 guest_addr, data, size, cpu_features); | 57 guest_addr, data, size, cpu_features); |
| 58 } | 58 } |
| OLD | NEW |