Rename emit_load_store to aarch64_emit_load_store

Likewise, this patch renames emit_load_store to
aarch64_emit_load_store.

gdb:

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

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

gdb/gdbserver:

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

	* linux-aarch64-low.c: Update all callers as emit_load_store
	is renamed to aarch64_emit_load_store.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a58e9b6ca450643025b5cb1cbce20e3231ad2064..829b427a3c6215072cba6f9ba3acd98ca3650f49 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_load_store): Rename to ...
+       (aarch64_emit_load_store): ... it.  All callers updated.
+
 2015-10-12  Yao Qi  <yao.qi@linaro.org>
 
        * arch/aarch64-insn.c (emit_insn): Rename to ...

diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index 99f4fb9fb727b95bb4cfcf416aa7a16f1463bd9d..0ec726981949d0837c7d3f1f3a4cc2f302502411 100644 (file)
--- a/gdb/arch/aarch64-insn.c
+++ b/gdb/arch/aarch64-insn.c
@@ -342,11 +342,11 @@ aarch64_emit_insn (uint32_t *buf, uint32_t insn)
 /* Helper function emitting a load or store instruction.  */
 
 int
-emit_load_store (uint32_t *buf, uint32_t size,
-                enum aarch64_opcodes opcode,
-                struct aarch64_register rt,
-                struct aarch64_register rn,
-                struct aarch64_memory_operand operand)
+aarch64_emit_load_store (uint32_t *buf, uint32_t size,
+                        enum aarch64_opcodes opcode,
+                        struct aarch64_register rt,
+                        struct aarch64_register rn,
+                        struct aarch64_memory_operand operand)
 {
   uint32_t op;
 

diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 37ef37eeba1f826d05361be8025668b54c61b74d..d51cabc5cf2b93fa7ef9f3071fe56c87ea8403e6 100644 (file)
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -269,7 +269,7 @@ void aarch64_relocate_instruction (uint32_t insn,
    0 .. 32760 range (12 bits << 3).  */
 
 #define emit_ldr(buf, rt, rn, operand) \
-  emit_load_store (buf, rt.is64 ? 3 : 2, LDR, rt, rn, operand)
+  aarch64_emit_load_store (buf, rt.is64 ? 3 : 2, LDR, rt, rn, operand)
 
 /* Write a LDRSW instruction into *BUF.  The register size is 64-bit.
 
@@ -283,7 +283,7 @@ void aarch64_relocate_instruction (uint32_t insn,
    0 .. 16380 range (12 bits << 2).  */
 
 #define emit_ldrsw(buf, rt, rn, operand)               \
-  emit_load_store (buf, 3, LDRSW, rt, rn, operand)
+  aarch64_emit_load_store (buf, 3, LDRSW, rt, rn, operand)
 
 
 /* Write a TBZ or TBNZ instruction into *BUF.
@@ -312,10 +312,10 @@ void aarch64_relocate_instruction (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,
-                    struct aarch64_register rt,
-                    struct aarch64_register rn,
-                    struct aarch64_memory_operand operand);
+int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
+                            enum aarch64_opcodes opcode,
+                            struct aarch64_register rt,
+                            struct aarch64_register rn,
+                            struct aarch64_memory_operand operand);
 
 #endif

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index dd08cee4a11059991cfc942d6d5c18c47582675b..8308d0713e1de71f0e9a06fc6b735dbf72c185ce 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 as emit_load_store
+       is renamed to aarch64_emit_load_store.
+
 2015-10-12  Yao Qi  <yao.qi@linaro.org>
 
        * linux-aarch64-low.c: Update all callers of function renaming

diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 963511b9bd642bed2957207a56fe8a05c5893d56..9cefdda2144ae75a4c9320e5171ce67e4ed58fa3 100644 (file)
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -902,7 +902,7 @@ emit_ldrh (uint32_t *buf, struct aarch64_register rt,
           struct aarch64_register rn,
           struct aarch64_memory_operand operand)
 {
-  return emit_load_store (buf, 1, LDR, rt, rn, operand);
+  return aarch64_emit_load_store (buf, 1, LDR, rt, rn, operand);
 }
 
 /* Write a LDRB instruction into *BUF.
@@ -921,7 +921,7 @@ emit_ldrb (uint32_t *buf, struct aarch64_register rt,
           struct aarch64_register rn,
           struct aarch64_memory_operand operand)
 {
-  return emit_load_store (buf, 0, LDR, rt, rn, operand);
+  return aarch64_emit_load_store (buf, 0, LDR, rt, rn, operand);
 }
 
 
@@ -942,7 +942,7 @@ emit_str (uint32_t *buf, struct aarch64_register rt,
          struct aarch64_register rn,
          struct aarch64_memory_operand operand)
 {
-  return emit_load_store (buf, rt.is64 ? 3 : 2, STR, rt, rn, operand);
+  return aarch64_emit_load_store (buf, rt.is64 ? 3 : 2, STR, rt, rn, operand);
 }
 
 /* Helper function emitting an exclusive load or store instruction.  */