Index: src/trusted/validator_arm/build.scons |
=================================================================== |
--- src/trusted/validator_arm/build.scons (revision 10678) |
+++ src/trusted/validator_arm/build.scons (working copy) |
@@ -86,16 +86,22 @@ |
# The list of tables in armv7.table that should use the automatically generated, |
# actual decoders. This list is used to allow us to incrementally change over |
# tables, as they pass the appropriate tests. |
-AUTO_GEN_TABLES = ["ARMv7", |
- "data_processing_and_miscellaneous_instructions", |
- "data_processing_register", |
- "data_processing_register_shifted_register", |
- "data_processing_immediate", |
- "multiply_and_multiply_accumulate", |
- "saturating_addition_and_subtraction", |
- "halfword_multiply_and_multiply_accumulate", |
- ] |
+ACTUAL_GEN_TABLES = ["ARMv7", |
+ "data_processing_and_miscellaneous_instructions", |
+ "data_processing_register", |
+ "data_processing_register_shifted_register", |
+ "data_processing_immediate", |
+ "multiply_and_multiply_accumulate", |
+ "saturating_addition_and_subtraction", |
+ "halfword_multiply_and_multiply_accumulate", |
+ ] |
+# The list of tables in armv7.table that should test the automatically |
+# generated baseline decoders. This list is used to allow us to incrementally |
+# switch tables over to using automatically generated baselines, as they |
+# pass the appropriate tests. |
+BASELINE_TEST_TABLES = ["data_processing_register"] |
+ |
# The separators to use for splitting up automatically generated actual |
# classes. |
AUTO_ACTUAL_SEPARATORS = ['VABD'] |
@@ -177,8 +183,10 @@ |
cl_args = GEN_CL_ARGS |
if table: |
cl_args += ' --table=' + table |
- for tbl in AUTO_GEN_TABLES: |
+ for tbl in ACTUAL_GEN_TABLES: |
cl_args += ' --auto-actual=' + tbl |
+ for tbl in BASELINE_TEST_TABLES: |
+ cl_args += ' --test-base=' + tbl |
for sep in AUTO_ACTUAL_SEPARATORS: |
cl_args += ' --auto-actual-sep=' + sep |
for sep in AUTO_BASELINE_SEPARATORS: |
@@ -296,6 +304,7 @@ |
['decoder_tester.cc', |
'inst_classes_testers.cc', |
'actual_vs_baseline.cc', |
+ 'baseline_vs_baseline.cc', |
'named_class_decoder.cc', |
_gen_dir('arm32_decode_named.cc')] + |
_gen_dirs(GenerateBaselineFiles( |