Use op_decl instead of op_src_decl + op_dest_decl in .isa templates.

The latter causes multiple variable definitions if the same operand
is used as both a src and a dest.

arch/alpha/isa/mem.isa:
arch/mips/isa/formats/mem.isa:
    Use op_decl instead of op_src_decl + op_dest_decl.
    The latter causes multiple variable definitions if the same operand
    is used as both a src and a dest.

--HG--
extra : convert_revision : c14d91b293d3afef45c8728d3d8784f372c0b7f4

diff --git a/arch/alpha/isa/mem.isa b/arch/alpha/isa/mem.isa
index 3c8b4f7554f80639482be62a35a4db4be7ff282f..8742d308f6f88c88add03fc92719328f5a18b873 100644 (file)
--- a/arch/alpha/isa/mem.isa
+++ b/arch/alpha/isa/mem.isa
@@ -311,8 +311,7 @@ def template LoadCompleteAcc {{
         Fault fault = NoFault;
 
         %(fp_enable_check)s;
-        %(op_src_decl)s;
-        %(op_dest_decl)s;
+        %(op_decl)s;
 
         memcpy(&Mem, data, sizeof(Mem));
 
@@ -410,8 +409,7 @@ def template StoreInitiateAcc {{
         uint64_t write_result = 0;
 
         %(fp_enable_check)s;
-        %(op_src_decl)s;
-        %(op_dest_decl)s;
+        %(op_decl)s;
         %(op_rd)s;
         %(ea_code)s;
 

diff --git a/arch/mips/isa/formats/mem.isa b/arch/mips/isa/formats/mem.isa
index 8a07e63d4bce45ffefc7e05e54cb4cbc60ddb6f0..404aa1ee1b45e8e1d1441c1f6ecabf3c6bbf2d28 100644 (file)
--- a/arch/mips/isa/formats/mem.isa
+++ b/arch/mips/isa/formats/mem.isa
@@ -276,8 +276,7 @@ def template LoadCompleteAcc {{
         Fault fault = NoFault;
 
         %(fp_enable_check)s;
-        %(op_src_decl)s;
-        %(op_dest_decl)s;
+        %(op_decl)s;
 
         memcpy(&Mem, data, sizeof(Mem));
 
@@ -375,8 +374,7 @@ def template StoreInitiateAcc {{
         uint64_t write_result = 0;
 
         %(fp_enable_check)s;
-        %(op_src_decl)s;
-        %(op_dest_decl)s;
+        %(op_decl)s;
         %(op_rd)s;
         %(ea_code)s;