commit 87a25cf59352617f8876b8bdc8d437d4aafe5ae3
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Aug 28 13:33:10 2012 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Aug 28 13:33:10 2012 +0000
tree c4d77b309b469039af93a0a7c328da357921e40c
parent 9bf4540507767487d66a415abcc02e83266bee81

s390: Add zEC12 machine model. Fix spelling for some older models.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12905 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_machine.c

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index a468f8d..04f05c7 100644
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -531,6 +531,7 @@
       { "2098", VEX_S390X_MODEL_Z10_BC },
       { "2817", VEX_S390X_MODEL_Z196 },
       { "2818", VEX_S390X_MODEL_Z114 },
+      { "2827", VEX_S390X_MODEL_ZEC12 },
    };
 
    Int    model, n, fh;

tests/s390x_features.c

diff --git a/tests/s390x_features.c b/tests/s390x_features.c
index f0fdb63..837d83e 100644
--- a/tests/s390x_features.c
+++ b/tests/s390x_features.c
@@ -79,12 +79,13 @@
    { "2066", "z800"   },
    { "2084", "z990"   },
    { "2086", "z890"   },
-   { "2094", "z9-ec"  },
-   { "2096", "z9-bc"  },
-   { "2097", "z10-ec" },
-   { "2098", "z10-bc" },
+   { "2094", "z9-EC"  },
+   { "2096", "z9-BC"  },
+   { "2097", "z10-EC" },
+   { "2098", "z10-BC" },
    { "2817", "z196"   },
    { "2818", "z114"   },
+   { "2827", "zEC12"  },
 };