arm: Rename emit_encoded_insn() to emit32()

Use shorter name that actually describes what the function does.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

1 files changed, 17 insertions, 17 deletions

diff --git a/arch/arm/encode.c b/arch/arm/encode.c
index 86a48124..8a13316f 100644
--- a/arch/arm/encode.c
+++ b/arch/arm/encode.c
@@ -140,7 +140,7 @@ static inline void emit(struct buffer *buf, unsigned char c)
 	assert(!err);
 }
 
-static void emit_encoded_insn(struct buffer *buf, uint32_t encoded_insn)
+static void emit32(struct buffer *buf, uint32_t encoded_insn)
 {
 	union {
 		uint32_t encoded_insn;
@@ -212,7 +212,7 @@ void encode_stm(struct buffer *buffer, uint16_t register_list)
 	encoded_insn = AL | MULTIPLE_LOAD_STORE | WRITE_BASE_REG | DECREMENT_BEFORE |
 			((arm_encode_reg(MACH_REG_SP) & 0xF) << 16) | register_list;
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 void encode_setup_fp(struct buffer *buffer, unsigned long offset)
@@ -223,7 +223,7 @@ void encode_setup_fp(struct buffer *buffer, unsigned long offset)
 	encoded_insn = encoded_insn | ((arm_encode_reg(MACH_REG_SP) & 0xF) << 16) |
 		((arm_encode_reg(MACH_REG_FP) & 0xF) << 12) | (offset & 0xFF);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 void encode_sub_sp(struct buffer *buffer, unsigned long frame_size)
@@ -240,7 +240,7 @@ void encode_sub_sp(struct buffer *buffer, unsigned long frame_size)
 		encoded_insn = encoded_insn | arm_encode_reg(MACH_REG_SP) << 12 |
 			arm_encode_reg(MACH_REG_SP) << 16 | (0xFC);
 
-		emit_encoded_insn(buffer, encoded_insn);
+		emit32(buffer, encoded_insn);
 		frame_size = frame_size - MAX_FRAME_SIZE_SUBTRACTED;
 	}
 
@@ -249,7 +249,7 @@ void encode_sub_sp(struct buffer *buffer, unsigned long frame_size)
 		encoded_insn = encoded_insn | arm_encode_reg(MACH_REG_SP) << 12 |
 			arm_encode_reg(MACH_REG_SP) << 16 | (frame_size & 0xFF);
 
-		emit_encoded_insn(buffer, encoded_insn);
+		emit32(buffer, encoded_insn);
 	}
 }
 
@@ -273,7 +273,7 @@ void encode_store_args(struct buffer *buffer, struct stack_frame *frame)
 		encoded_insn = encoded_insn | IMM_OFFSET_SUB | ((arm_encode_reg(MACH_REG_FP) & 0xF) << 16) |
 				((arm_encode_reg(arg_regs[i]) & 0xFF) << 12) | (offset & 0xFFF);
 
-		emit_encoded_insn(buffer, encoded_insn);
+		emit32(buffer, encoded_insn);
 	}
 }
 
@@ -285,7 +285,7 @@ void encode_restore_sp(struct buffer *buffer, unsigned long offset)
 	encoded_insn = encoded_insn | ((arm_encode_reg(MACH_REG_FP) & 0xF) << 16) |
 		((arm_encode_reg(MACH_REG_SP) & 0xF) << 12) | (offset & 0xFF);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 void encode_ldm(struct buffer *buffer, uint16_t register_list)
@@ -294,7 +294,7 @@ void encode_ldm(struct buffer *buffer, uint16_t register_list)
 	encoded_insn = AL | MULTIPLE_LOAD_STORE | LOAD_INSN | DECREMENT_BEFORE |
 			((arm_encode_reg(MACH_REG_SP) & 0xF) << 16) | register_list;
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 /*
@@ -315,20 +315,20 @@ void encode_setup_trampoline(struct buffer *buffer, uint32_t cu_addr, uint32_t t
 	encoded_insn = arm_encode_insn[INSN_UNCOND_BRANCH];
 	encoded_insn = encoded_insn | ((0x000004) >> 2 & 0xFFFFFF);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 
 	/* Emit the address of cu */
-	emit_encoded_insn(buffer, cu_addr);
+	emit32(buffer, cu_addr);
 
 	/* Emit the address of magic_tampoline */
-	emit_encoded_insn(buffer, target_addr);
+	emit32(buffer, target_addr);
 
 	/* Load the addr of cu in R0 */
 	encoded_insn = arm_encode_insn[INSN_LDR_REG_MEMLOCAL];
 	encoded_insn = encoded_insn | IMM_OFFSET_SUB | ((arm_encode_reg(MACH_REG_R0) & 0xF) << 12) |
 			((arm_encode_reg(MACH_REG_PC) & 0xF) << 16) | (0x010);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 
 	/* Call jit_magic_trampoline. First store the value of PC in LR
 	   and then Load the address of magic_trampoline form constant pool */
@@ -336,13 +336,13 @@ void encode_setup_trampoline(struct buffer *buffer, uint32_t cu_addr, uint32_t t
 	encoded_insn = encoded_insn | ((arm_encode_reg(MACH_REG_LR) & 0xF) << 12) |
 			((arm_encode_reg(MACH_REG_PC) & 0xF) << 16) | (0x000);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 
 	encoded_insn = arm_encode_insn[INSN_LDR_REG_MEMLOCAL];
 	encoded_insn = encoded_insn | IMM_OFFSET_SUB | ((arm_encode_reg(MACH_REG_PC) & 0xF) << 12) |
 			((arm_encode_reg(MACH_REG_PC) & 0xF) << 16) | (0x014);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 void encode_emit_branch_link(struct buffer *buffer)
@@ -351,13 +351,13 @@ void encode_emit_branch_link(struct buffer *buffer)
 	encoded_insn = encoded_insn | ((arm_encode_reg(MACH_REG_LR) & 0xF) << 12) |
 			((arm_encode_reg(MACH_REG_PC) & 0xF) << 16) | (0x000);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 
 	encoded_insn = arm_encode_insn[INSN_MOV_REG_REG];
 	encoded_insn = encoded_insn | ((arm_encode_reg(MACH_REG_PC) & 0xF) << 12) |
 			(arm_encode_reg(MACH_REG_R0) & 0xF);
 
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }
 
 void insn_encode(struct insn *insn, struct buffer *buffer, struct basic_block *bb)
@@ -388,5 +388,5 @@ void insn_encode(struct insn *insn, struct buffer *buffer, struct basic_block *b
 		if (!(insn->type == INSN_MOV_REG_IMM || insn->type == INSN_MOV_REG_REG || insn->type == INSN_MVN_REG_IMM))
 			encoded_insn = encoded_insn | ((arm_encode_reg(mach_reg(&insn->dest.reg)) & 0xF) << 16);
 	}
-	emit_encoded_insn(buffer, encoded_insn);
+	emit32(buffer, encoded_insn);
 }