Generalise s390_amode_is_constant.

diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
index e398987600546fd763e38a61939b8a59cdd41894..db5345632162165a50a8d16fed90eb8580566a80 100644 (file)
--- a/VEX/priv/host_s390_defs.c
+++ b/VEX/priv/host_s390_defs.c
@@ -395,7 +395,8 @@ s390_amode_is_sane(const s390_amode *am)
 static Bool
 s390_amode_is_constant(const s390_amode *am)
 {
-   return am->tag == S390_AMODE_B12 && sameHReg(am->b, s390_hreg_gpr(0));
+   return sameHReg(am->b, s390_hreg_gpr(0)) &&
+          sameHReg(am->x, s390_hreg_gpr(0));
 }