Merge branch 'binutils' into tmp

[pf3gnuchains/pf3gnuchains4x.git] / sid / component / cgen-cpu / sh / sh3e-model.cxx

diff --git a/sid/component/cgen-cpu/sh/sh3e-model.cxx b/sid/component/cgen-cpu/sh/sh3e-model.cxx
index 403b6f7..694817e 100644 (file)
--- a/sid/component/cgen-cpu/sh/sh3e-model.cxx
+++ b/sid/component/cgen-cpu/sh/sh3e-model.cxx
@@ -716,7 +716,7 @@ sh3e_sh3e_model::model_bts_compact_after (sh3e_cpu *current_cpu, sh3e_scache *se
 UINT
 sh3e_sh3e_model::model_clrmac_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -736,7 +736,7 @@ sh3e_sh3e_model::model_clrmac_compact_before (sh3e_cpu *current_cpu, sh3e_scache
 UINT
 sh3e_sh3e_model::model_clrmac_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -762,7 +762,7 @@ sh3e_sh3e_model::model_clrmac_compact_after (sh3e_cpu *current_cpu, sh3e_scache
 UINT
 sh3e_sh3e_model::model_clrs_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -779,7 +779,7 @@ sh3e_sh3e_model::model_clrs_compact_before (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_clrs_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -800,7 +800,7 @@ sh3e_sh3e_model::model_clrs_compact_after (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_clrt_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -820,7 +820,7 @@ sh3e_sh3e_model::model_clrt_compact_before (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_clrt_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -1510,7 +1510,7 @@ sh3e_sh3e_model::model_div0s_compact_after (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_div0u_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -1530,7 +1530,7 @@ sh3e_sh3e_model::model_div0u_compact_before (sh3e_cpu *current_cpu, sh3e_scache
 UINT
 sh3e_sh3e_model::model_div0u_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -3270,7 +3270,7 @@ sh3e_sh3e_model::model_fneg_compact_after (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_frchg_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -3284,7 +3284,7 @@ sh3e_sh3e_model::model_frchg_compact_before (sh3e_cpu *current_cpu, sh3e_scache
 UINT
 sh3e_sh3e_model::model_frchg_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -3300,7 +3300,7 @@ sh3e_sh3e_model::model_frchg_compact_after (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_fschg_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -3314,7 +3314,7 @@ sh3e_sh3e_model::model_fschg_compact_before (sh3e_cpu *current_cpu, sh3e_scache
 UINT
 sh3e_sh3e_model::model_fschg_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -6956,7 +6956,7 @@ sh3e_sh3e_model::model_negc_compact_after (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_nop_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -6970,7 +6970,7 @@ sh3e_sh3e_model::model_nop_compact_before (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_nop_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7488,7 +7488,7 @@ sh3e_sh3e_model::model_rotr_compact_after (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_rts_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7502,7 +7502,7 @@ sh3e_sh3e_model::model_rts_compact_before (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_rts_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7519,7 +7519,7 @@ sh3e_sh3e_model::model_rts_compact_after (sh3e_cpu *current_cpu, sh3e_scache *se
 UINT
 sh3e_sh3e_model::model_sets_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7536,7 +7536,7 @@ sh3e_sh3e_model::model_sets_compact_before (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_sets_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7557,7 +7557,7 @@ sh3e_sh3e_model::model_sets_compact_after (sh3e_cpu *current_cpu, sh3e_scache *s
 UINT
 sh3e_sh3e_model::model_sett_compact_before (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;
@@ -7577,7 +7577,7 @@ sh3e_sh3e_model::model_sett_compact_before (sh3e_cpu *current_cpu, sh3e_scache *
 UINT
 sh3e_sh3e_model::model_sett_compact_after (sh3e_cpu *current_cpu, sh3e_scache *sem)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const sh3e_scache* abuf = sem;
   const sh3e_idesc* idesc = abuf->idesc;
   int cycles = 0;