ARM: 8844/1: use unified assembler in assembly files (e44fc388) · Commits · 戴 / test

arch/arm/boot/bootp/init.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,7 @@ _start: add lr, pc, #-0x8 @ lr = current load addr
	*/		*/
	movne r10, #0 @ terminator		movne r10, #0 @ terminator
	movne r4, #2 @ Size of this entry (2 words)		movne r4, #2 @ Size of this entry (2 words)
	stmneia r9, {r4, r5, r10} @ Size, ATAG_CORE, terminator		stmiane r9, {r4, r5, r10} @ Size, ATAG_CORE, terminator

	/*		/*
	* find the end of the tag list, and then add an INITRD tag on the end.		* find the end of the tag list, and then add an INITRD tag on the end.

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ Lrow4bpplp:
	tst r1, #7 @ avoid using r7 directly after		tst r1, #7 @ avoid using r7 directly after
	str r7, [r0, -r5]!		str r7, [r0, -r5]!
	subne r1, r1, #1		subne r1, r1, #1
	ldrneb r7, [r6, r1]		ldrbne r7, [r6, r1]
	bne Lrow4bpplp		bne Lrow4bpplp
	ldmfd sp!, {r4 - r7, pc}		ldmfd sp!, {r4 - r7, pc}

	@@ -103,7 +103,7 @@ Lrow8bpplp:
	sub r0, r0, r5 @ avoid ip		sub r0, r0, r5 @ avoid ip
	stmia r0, {r4, ip}		stmia r0, {r4, ip}
	subne r1, r1, #1		subne r1, r1, #1
	ldrneb r7, [r6, r1]		ldrbne r7, [r6, r1]
	bne Lrow8bpplp		bne Lrow8bpplp
	ldmfd sp!, {r4 - r7, pc}		ldmfd sp!, {r4 - r7, pc}

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,25 +16,25 @@
	ldr \tmp, =irq_prio_h		ldr \tmp, =irq_prio_h
	teq \irqstat, #0		teq \irqstat, #0
	#ifdef IOMD_BASE		#ifdef IOMD_BASE
	ldreqb \irqstat, [\base, #IOMD_DMAREQ] @ get dma		ldrbeq \irqstat, [\base, #IOMD_DMAREQ] @ get dma
	addeq \tmp, \tmp, #256 @ irq_prio_h table size		addeq \tmp, \tmp, #256 @ irq_prio_h table size
	teqeq \irqstat, #0		teqeq \irqstat, #0
	bne 2406f		bne 2406f
	#endif		#endif
	ldreqb \irqstat, [\base, #IOMD_IRQREQA] @ get low priority		ldrbeq \irqstat, [\base, #IOMD_IRQREQA] @ get low priority
	addeq \tmp, \tmp, #256 @ irq_prio_d table size		addeq \tmp, \tmp, #256 @ irq_prio_d table size
	teqeq \irqstat, #0		teqeq \irqstat, #0
	#ifdef IOMD_IRQREQC		#ifdef IOMD_IRQREQC
	ldreqb \irqstat, [\base, #IOMD_IRQREQC]		ldrbeq \irqstat, [\base, #IOMD_IRQREQC]
	addeq \tmp, \tmp, #256 @ irq_prio_l table size		addeq \tmp, \tmp, #256 @ irq_prio_l table size
	teqeq \irqstat, #0		teqeq \irqstat, #0
	#endif		#endif
	#ifdef IOMD_IRQREQD		#ifdef IOMD_IRQREQD
	ldreqb \irqstat, [\base, #IOMD_IRQREQD]		ldrbeq \irqstat, [\base, #IOMD_IRQREQD]
	addeq \tmp, \tmp, #256 @ irq_prio_lc table size		addeq \tmp, \tmp, #256 @ irq_prio_lc table size
	teqeq \irqstat, #0		teqeq \irqstat, #0
	#endif		#endif
	2406: ldrneb \irqnr, [\tmp, \irqstat] @ get IRQ number		2406: ldrbne \irqnr, [\tmp, \irqstat] @ get IRQ number
	.endm		.endm

	/*		/*

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -173,7 +173,7 @@

	.macro senduart, rd, rx		.macro senduart, rd, rx
	cmp \rx, #0		cmp \rx, #0
	strneb \rd, [\rx, #UART_TX << UART_SHIFT]		strbne \rd, [\rx, #UART_TX << UART_SHIFT]
	1001:		1001:
	.endm		.endm

+1 −1