D40364.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40364.diff
View Options

	diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	--- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	+++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c
	@@ -130,35 +130,25 @@
	*/
	if (*instr == NOP_INSTR)
	found = true;
	- if (!found) {
	- for (; instr < limit; instr++) {
	+ for (; !found && instr < limit; instr++) {
	+ /*
	+ * Functions start with "stp xt1, xt2, [xn, <const>]!" or
	+ * "sub sp, sp, <const>".
	+ *
	+ * Sometimes the compiler will have a sub instruction that is
	+ * not of the above type so don't stop if we see one.
	+ */
	+ if ((*instr & LDP_STP_MASK) == STP_64) {
	/*
	- * Some functions start with
	- * "stp xt1, xt2, [xn, <const>]!"
	+ * Assume any other store of this type means we are
	+ * past the function prologue.
	*/
	- if ((*instr & LDP_STP_MASK) == STP_64) {
	- /*
	- * Assume any other store of this type means we
	- * are past the function prolog.
	- */
	- if (((*instr >> ADDR_SHIFT) & ADDR_MASK) == 31)
	- found = true;
	- break;
	- }
	-
	- /*
	- * Some functions start with a "sub sp, sp, <const>"
	- * Sometimes the compiler will have a sub instruction
	- * that is not of the above type so don't stop if we
	- * see one.
	- */
	- if ((*instr & SUB_MASK) == SUB_INSTR &&
	- ((*instr >> SUB_RD_SHIFT) & SUB_R_MASK) == 31 &&
	- ((*instr >> SUB_RN_SHIFT) & SUB_R_MASK) == 31) {
	+ if (((*instr >> ADDR_SHIFT) & ADDR_MASK) == 31)
	found = true;
	- break;
	- }
	- }
	+ } else if ((*instr & SUB_MASK) == SUB_INSTR &&
	+ ((*instr >> SUB_RD_SHIFT) & SUB_R_MASK) == 31 &&
	+ ((*instr >> SUB_RN_SHIFT) & SUB_R_MASK) == 31)
	+ found = true;
	}

	if (!found)