Rename emit_insn to aarch64_emit_insn

As emit_insn becomes extern, the prefix "aarch64_" is needed.  This
patch renames emit_insn to aarch64_emit_insn.

gdb:

2015-10-12  Yao Qi  <yao.qi@linaro.org>

	* arch/aarch64-insn.c (emit_insn): Rename to ...
	(aarch64_emit_insn): ... it.  All callers updated.

gdb/gdbserver:

2015-10-12  Yao Qi  <yao.qi@linaro.org>

	* linux-aarch64-low.c: Update all callers of function renaming
	from emit_insn to aarch64_emit_insn.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45a85e50d5264872b8495142f777bf0b995e08f0..a58e9b6ca450643025b5cb1cbce20e3231ad2064 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-12  Yao Qi  <yao.qi@linaro.org>
+
+       * arch/aarch64-insn.c (emit_insn): Rename to ...
+       (aarch64_emit_insn): ... it.  All callers updated.
+
 2015-10-12  Yao Qi  <yao.qi@linaro.org>
 
        * aarch64-linux-tdep.c: Include arch-utils.h.

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 84260630044d624a84818bb232a57e196e938201..995cbcf5427c43f5e7e1f3200dd96cd0766cca9c 100644 (file)
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -2771,7 +2771,7 @@ aarch64_displaced_step_others (const uint32_t insn,
   struct aarch64_displaced_step_data *dsd
     = (struct aarch64_displaced_step_data *) data;
 
-  emit_insn (dsd->insn_buf, insn);
+  aarch64_emit_insn (dsd->insn_buf, insn);
   dsd->insn_count = 1;
 
   if ((insn & 0xfffffc1f) == 0xd65f0000)

diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index 3bc01173468c50532ad81500e569b3a3a72a94ff..99f4fb9fb727b95bb4cfcf416aa7a16f1463bd9d 100644 (file)
--- a/gdb/arch/aarch64-insn.c
+++ b/gdb/arch/aarch64-insn.c
@@ -333,7 +333,7 @@ aarch64_relocate_instruction (uint32_t insn,
    instructions written (aka. 1).  */
 
 int
-emit_insn (uint32_t *buf, uint32_t insn)
+aarch64_emit_insn (uint32_t *buf, uint32_t insn)
 {
   *buf = insn;
   return 1;
@@ -356,10 +356,10 @@ emit_load_store (uint32_t *buf, uint32_t size,
       {
        op = ENCODE (1, 1, 24);
 
-       return emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
-                         | ENCODE (operand.index >> 3, 12, 10)
-                         | ENCODE (rn.num, 5, 5)
-                         | ENCODE (rt.num, 5, 0));
+       return aarch64_emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
+                                 | ENCODE (operand.index >> 3, 12, 10)
+                                 | ENCODE (rn.num, 5, 5)
+                                 | ENCODE (rt.num, 5, 0));
       }
     case MEMORY_OPERAND_POSTINDEX:
       {
@@ -367,9 +367,10 @@ emit_load_store (uint32_t *buf, uint32_t size,
 
        op = ENCODE (0, 1, 24);
 
-       return emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
-                         | post_index | ENCODE (operand.index, 9, 12)
-                         | ENCODE (rn.num, 5, 5) | ENCODE (rt.num, 5, 0));
+       return aarch64_emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
+                                 | post_index | ENCODE (operand.index, 9, 12)
+                                 | ENCODE (rn.num, 5, 5)
+                                 | ENCODE (rt.num, 5, 0));
       }
     case MEMORY_OPERAND_PREINDEX:
       {
@@ -377,10 +378,10 @@ emit_load_store (uint32_t *buf, uint32_t size,
 
        op = ENCODE (0, 1, 24);
 
-       return emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
-                         | pre_index | ENCODE (operand.index, 9, 12)
-                         | ENCODE (rn.num, 5, 5)
-                         | ENCODE (rt.num, 5, 0));
+       return aarch64_emit_insn (buf, opcode | ENCODE (size, 2, 30) | op
+                                 | pre_index | ENCODE (operand.index, 9, 12)
+                                 | ENCODE (rn.num, 5, 5)
+                                 | ENCODE (rt.num, 5, 0));
       }
     default:
       return 0;

diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 01a5d736ae17cf1ed0cd21fc97e49c38b99a2070..37ef37eeba1f826d05361be8025668b54c61b74d 100644 (file)
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -223,7 +223,7 @@ void aarch64_relocate_instruction (uint32_t insn,
    +/- 128MB (26 bits << 2).  */
 
 #define emit_b(buf, is_bl, offset) \
-  emit_insn (buf, ((is_bl) ? BL : B) | (ENCODE ((offset) >> 2, 26, 0)))
+  aarch64_emit_insn (buf, ((is_bl) ? BL : B) | (ENCODE ((offset) >> 2, 26, 0)))
 
 /* Write a BCOND instruction into *BUF.
 
@@ -234,10 +234,10 @@ void aarch64_relocate_instruction (uint32_t insn,
    byte-addressed but should be 4 bytes aligned.  It has a limited range of
    +/- 1MB (19 bits << 2).  */
 
-#define emit_bcond(buf, cond, offset)                  \
-  emit_insn (buf,                                      \
-            BCOND | ENCODE ((offset) >> 2, 19, 5)      \
-            | ENCODE ((cond), 4, 0))
+#define emit_bcond(buf, cond, offset)                          \
+  aarch64_emit_insn (buf,                                      \
+                    BCOND | ENCODE ((offset) >> 2, 19, 5)      \
+                    | ENCODE ((cond), 4, 0))
 
 /* Write a CBZ or CBNZ instruction into *BUF.
 
@@ -250,12 +250,12 @@ void aarch64_relocate_instruction (uint32_t insn,
    byte-addressed but should be 4 bytes aligned.  It has a limited range of
    +/- 1MB (19 bits << 2).  */
 
-#define emit_cb(buf, is_cbnz, rt, offset)              \
-  emit_insn (buf,                                      \
-            ((is_cbnz) ? CBNZ : CBZ)                   \
-            | ENCODE (rt.is64, 1, 31)  /* sf */        \
-            | ENCODE (offset >> 2, 19, 5) /* imm19 */  \
-            | ENCODE (rt.num, 5, 0))
+#define emit_cb(buf, is_cbnz, rt, offset)                      \
+  aarch64_emit_insn (buf,                                      \
+                    ((is_cbnz) ? CBNZ : CBZ)                   \
+                    | ENCODE (rt.is64, 1, 31)  /* sf */        \
+                    | ENCODE (offset >> 2, 19, 5) /* imm19 */  \
+                    | ENCODE (rt.num, 5, 0))
 
 /* Write a LDR instruction into *BUF.
 
@@ -298,19 +298,19 @@ void aarch64_relocate_instruction (uint32_t insn,
    byte-addressed but should be 4 bytes aligned.  It has a limited range of
    +/- 32KB (14 bits << 2).  */
 
-#define emit_tb(buf, is_tbnz, bit, rt, offset)        \
-  emit_insn (buf,                                     \
-            ((is_tbnz) ? TBNZ: TBZ)                   \
-            | ENCODE (bit >> 5, 1, 31) /* b5 */       \
-            | ENCODE (bit, 5, 19) /* b40 */           \
-            | ENCODE (offset >> 2, 14, 5) /* imm14 */ \
-            | ENCODE (rt.num, 5, 0))
+#define emit_tb(buf, is_tbnz, bit, rt, offset)                \
+  aarch64_emit_insn (buf,                                     \
+                    ((is_tbnz) ? TBNZ: TBZ)                   \
+                    | ENCODE (bit >> 5, 1, 31) /* b5 */       \
+                    | ENCODE (bit, 5, 19) /* b40 */           \
+                    | ENCODE (offset >> 2, 14, 5) /* imm14 */ \
+                    | ENCODE (rt.num, 5, 0))
 
 /* Write a NOP instruction into *BUF.  */
 
-#define emit_nop(buf) emit_insn (buf, NOP)
+#define emit_nop(buf) aarch64_emit_insn (buf, NOP)
 
-int emit_insn (uint32_t *buf, uint32_t insn);
+int aarch64_emit_insn (uint32_t *buf, uint32_t insn);
 
 int emit_load_store (uint32_t *buf, uint32_t size,
                     enum aarch64_opcodes opcode,

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 32810265ac6979b32d1f8b19d1a0d8408ee27621..dd08cee4a11059991cfc942d6d5c18c47582675b 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-12  Yao Qi  <yao.qi@linaro.org>
+
+       * linux-aarch64-low.c: Update all callers of function renaming
+       from emit_insn to aarch64_emit_insn.
+
 2015-10-12  Yao Qi  <yao.qi@linaro.org>
 
        * linux-aarch64-low.c (enum aarch64_opcodes): Move to

diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 9450449959e0e9f6831023de497e51b1266c137e..963511b9bd642bed2957207a56fe8a05c5893d56 100644 (file)
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -743,7 +743,7 @@ enum aarch64_system_control_registers
 static int
 emit_blr (uint32_t *buf, struct aarch64_register rn)
 {
-  return emit_insn (buf, BLR | ENCODE (rn.num, 5, 5));
+  return aarch64_emit_insn (buf, BLR | ENCODE (rn.num, 5, 5));
 }
 
 /* Write a RET instruction into *BUF.
@@ -755,7 +755,7 @@ emit_blr (uint32_t *buf, struct aarch64_register rn)
 static int
 emit_ret (uint32_t *buf, struct aarch64_register rn)
 {
-  return emit_insn (buf, RET | ENCODE (rn.num, 5, 5));
+  return aarch64_emit_insn (buf, RET | ENCODE (rn.num, 5, 5));
 }
 
 static int
@@ -798,10 +798,10 @@ emit_load_store_pair (uint32_t *buf, enum aarch64_opcodes opcode,
       return 0;
     }
 
-  return emit_insn (buf, opcode | opc | pre_index | write_back
-                   | ENCODE (operand.index >> 3, 7, 15)
-                   | ENCODE (rt2.num, 5, 10)
-                   | ENCODE (rn.num, 5, 5) | ENCODE (rt.num, 5, 0));
+  return aarch64_emit_insn (buf, opcode | opc | pre_index | write_back
+                           | ENCODE (operand.index >> 3, 7, 15)
+                           | ENCODE (rt2.num, 5, 10)
+                           | ENCODE (rn.num, 5, 5) | ENCODE (rt.num, 5, 0));
 }
 
 /* Write a STP instruction into *BUF.
@@ -858,9 +858,10 @@ emit_ldp_q_offset (uint32_t *buf, unsigned rt, unsigned rt2,
   uint32_t opc = ENCODE (2, 2, 30);
   uint32_t pre_index = ENCODE (1, 1, 24);
 
-  return emit_insn (buf, LDP_SIMD_VFP | opc | pre_index
-                   | ENCODE (offset >> 4, 7, 15) | ENCODE (rt2, 5, 10)
-                   | ENCODE (rn.num, 5, 5) | ENCODE (rt, 5, 0));
+  return aarch64_emit_insn (buf, LDP_SIMD_VFP | opc | pre_index
+                           | ENCODE (offset >> 4, 7, 15)
+                           | ENCODE (rt2, 5, 10)
+                           | ENCODE (rn.num, 5, 5) | ENCODE (rt, 5, 0));
 }
 
 /* Write a STP (SIMD&VFP) instruction using Q registers into *BUF.
@@ -879,7 +880,7 @@ emit_stp_q_offset (uint32_t *buf, unsigned rt, unsigned rt2,
   uint32_t opc = ENCODE (2, 2, 30);
   uint32_t pre_index = ENCODE (1, 1, 24);
 
-  return emit_insn (buf, STP_SIMD_VFP | opc | pre_index
+  return aarch64_emit_insn (buf, STP_SIMD_VFP | opc | pre_index
                            | ENCODE (offset >> 4, 7, 15)
                            | ENCODE (rt2, 5, 10)
                            | ENCODE (rn.num, 5, 5) | ENCODE (rt, 5, 0));
@@ -954,9 +955,9 @@ emit_load_store_exclusive (uint32_t *buf, uint32_t size,
                           struct aarch64_register rt2,
                           struct aarch64_register rn)
 {
-  return emit_insn (buf, opcode | ENCODE (size, 2, 30)
-                   | ENCODE (rs.num, 5, 16) | ENCODE (rt2.num, 5, 10)
-                   | ENCODE (rn.num, 5, 5) | ENCODE (rt.num, 5, 0));
+  return aarch64_emit_insn (buf, opcode | ENCODE (size, 2, 30)
+                           | ENCODE (rs.num, 5, 16) | ENCODE (rt2.num, 5, 10)
+                           | ENCODE (rn.num, 5, 5) | ENCODE (rt.num, 5, 0));
 }
 
 /* Write a LAXR instruction into *BUF.
@@ -1015,8 +1016,8 @@ emit_data_processing_reg (uint32_t *buf, enum aarch64_opcodes opcode,
 {
   uint32_t size = ENCODE (rd.is64, 1, 31);
 
-  return emit_insn (buf, opcode | size | ENCODE (rm.num, 5, 16)
-                   | ENCODE (rn.num, 5, 5) | ENCODE (rd.num, 5, 0));
+  return aarch64_emit_insn (buf, opcode | size | ENCODE (rm.num, 5, 16)
+                           | ENCODE (rn.num, 5, 5) | ENCODE (rd.num, 5, 0));
 }
 
 /* Helper function for data processing instructions taking either a register
@@ -1037,9 +1038,10 @@ emit_data_processing (uint32_t *buf, enum aarch64_opcodes opcode,
       /* xxx1 000x xxxx xxxx xxxx xxxx xxxx xxxx */
       operand_opcode = ENCODE (8, 4, 25);
 
-      return emit_insn (buf, opcode | operand_opcode | size
-                       | ENCODE (operand.imm, 12, 10)
-                       | ENCODE (rn.num, 5, 5) | ENCODE (rd.num, 5, 0));
+      return aarch64_emit_insn (buf, opcode | operand_opcode | size
+                               | ENCODE (operand.imm, 12, 10)
+                               | ENCODE (rn.num, 5, 5)
+                               | ENCODE (rd.num, 5, 0));
     }
   else
     {
@@ -1112,9 +1114,9 @@ emit_mov (uint32_t *buf, struct aarch64_register rd,
       /* Do not shift the immediate.  */
       uint32_t shift = ENCODE (0, 2, 21);
 
-      return emit_insn (buf, MOV | size | shift
-                       | ENCODE (operand.imm, 16, 5)
-                       | ENCODE (rd.num, 5, 0));
+      return aarch64_emit_insn (buf, MOV | size | shift
+                               | ENCODE (operand.imm, 16, 5)
+                               | ENCODE (rd.num, 5, 0));
     }
   else
     return emit_add (buf, rd, operand.reg, immediate_operand (0));
@@ -1134,8 +1136,8 @@ emit_movk (uint32_t *buf, struct aarch64_register rd, uint32_t imm,
 {
   uint32_t size = ENCODE (rd.is64, 1, 31);
 
-  return emit_insn (buf, MOVK | size | ENCODE (shift, 2, 21) |
-                   ENCODE (imm, 16, 5) | ENCODE (rd.num, 5, 0));
+  return aarch64_emit_insn (buf, MOVK | size | ENCODE (shift, 2, 21) |
+                           ENCODE (imm, 16, 5) | ENCODE (rd.num, 5, 0));
 }
 
 /* Write instructions into *BUF in order to move ADDR into a register.
@@ -1343,8 +1345,8 @@ static int
 emit_mrs (uint32_t *buf, struct aarch64_register rt,
          enum aarch64_system_control_registers system_reg)
 {
-  return emit_insn (buf, MRS | ENCODE (system_reg, 15, 5)
-                   | ENCODE (rt.num, 5, 0));
+  return aarch64_emit_insn (buf, MRS | ENCODE (system_reg, 15, 5)
+                           | ENCODE (rt.num, 5, 0));
 }
 
 /* Write a MSR instruction into *BUF.  The register size is 64-bit.
@@ -1358,8 +1360,8 @@ static int
 emit_msr (uint32_t *buf, enum aarch64_system_control_registers system_reg,
          struct aarch64_register rt)
 {
-  return emit_insn (buf, MSR | ENCODE (system_reg, 15, 5)
-                   | ENCODE (rt.num, 5, 0));
+  return aarch64_emit_insn (buf, MSR | ENCODE (system_reg, 15, 5)
+                           | ENCODE (rt.num, 5, 0));
 }
 
 /* Write a SEVL instruction into *BUF.
@@ -1369,7 +1371,7 @@ emit_msr (uint32_t *buf, enum aarch64_system_control_registers system_reg,
 static int
 emit_sevl (uint32_t *buf)
 {
-  return emit_insn (buf, SEVL);
+  return aarch64_emit_insn (buf, SEVL);
 }
 
 /* Write a WFE instruction into *BUF.
@@ -1379,7 +1381,7 @@ emit_sevl (uint32_t *buf)
 static int
 emit_wfe (uint32_t *buf)
 {
-  return emit_insn (buf, WFE);
+  return aarch64_emit_insn (buf, WFE);
 }
 
 /* Write a SBFM instruction into *BUF.
@@ -1401,9 +1403,9 @@ emit_sbfm (uint32_t *buf, struct aarch64_register rd,
   uint32_t size = ENCODE (rd.is64, 1, 31);
   uint32_t n = ENCODE (rd.is64, 1, 22);
 
-  return emit_insn (buf, SBFM | size | n | ENCODE (immr, 6, 16)
-                   | ENCODE (imms, 6, 10) | ENCODE (rn.num, 5, 5)
-                   | ENCODE (rd.num, 5, 0));
+  return aarch64_emit_insn (buf, SBFM | size | n | ENCODE (immr, 6, 16)
+                           | ENCODE (imms, 6, 10) | ENCODE (rn.num, 5, 5)
+                           | ENCODE (rd.num, 5, 0));
 }
 
 /* Write a SBFX instruction into *BUF.
@@ -1446,9 +1448,9 @@ emit_ubfm (uint32_t *buf, struct aarch64_register rd,
   uint32_t size = ENCODE (rd.is64, 1, 31);
   uint32_t n = ENCODE (rd.is64, 1, 22);
 
-  return emit_insn (buf, UBFM | size | n | ENCODE (immr, 6, 16)
-                   | ENCODE (imms, 6, 10) | ENCODE (rn.num, 5, 5)
-                   | ENCODE (rd.num, 5, 0));
+  return aarch64_emit_insn (buf, UBFM | size | n | ENCODE (immr, 6, 16)
+                           | ENCODE (imms, 6, 10) | ENCODE (rn.num, 5, 5)
+                           | ENCODE (rd.num, 5, 0));
 }
 
 /* Write a UBFX instruction into *BUF.
@@ -1490,9 +1492,9 @@ emit_csinc (uint32_t *buf, struct aarch64_register rd,
 {
   uint32_t size = ENCODE (rd.is64, 1, 31);
 
-  return emit_insn (buf, CSINC | size | ENCODE (rm.num, 5, 16)
-                   | ENCODE (cond, 4, 12) | ENCODE (rn.num, 5, 5)
-                   | ENCODE (rd.num, 5, 0));
+  return aarch64_emit_insn (buf, CSINC | size | ENCODE (rm.num, 5, 16)
+                           | ENCODE (cond, 4, 12) | ENCODE (rn.num, 5, 5)
+                           | ENCODE (rd.num, 5, 0));
 }
 
 /* Write a CSET instruction into *BUF.
@@ -1757,7 +1759,7 @@ aarch64_ftrace_insn_reloc_others (const uint32_t insn,
 
   /* The instruction is not PC relative.  Just re-emit it at the new
      location.  */
-  insn_reloc->insn_ptr += emit_insn (insn_reloc->insn_ptr, insn);
+  insn_reloc->insn_ptr += aarch64_emit_insn (insn_reloc->insn_ptr, insn);
 }
 
 static const struct aarch64_insn_visitor visitor =