PERFORCE change 62101 for review

Marcel Moolenaar marcel at FreeBSD.org
Thu Sep 23 22:08:04 PDT 2004 

http://perforce.freebsd.org/chv.cgi?CH=62101

Change 62101 by marcel at marcel_nfs on 2004/09/24 05:07:43

	IFC @62100

Affected files ...

.. //depot/projects/ia64/lib/csu/arm/crt1.c#3 integrate
.. //depot/projects/ia64/lib/csu/arm/crti.S#2 integrate
.. //depot/projects/ia64/lib/csu/arm/crtn.S#2 integrate
.. //depot/projects/ia64/lib/libc/arm/gen/Makefile.inc#3 integrate
.. //depot/projects/ia64/lib/libc/arm/gen/_set_tp.c#1 branch
.. //depot/projects/ia64/lib/libc/arm/gen/setjmp.S#2 integrate
.. //depot/projects/ia64/lib/libc/arm/string/memcmp.S#2 integrate
.. //depot/projects/ia64/lib/libc/arm/string/memcpy_xscale.S#2 integrate
.. //depot/projects/ia64/lib/libc/gen/tls.c#3 integrate
.. //depot/projects/ia64/libexec/rtld-elf/arm/reloc.c#2 integrate
.. //depot/projects/ia64/libexec/rtld-elf/arm/rtld_machdep.h#2 integrate
.. //depot/projects/ia64/libexec/rtld-elf/arm/rtld_start.S#2 integrate
.. //depot/projects/ia64/libexec/rtld-elf/rtld.c#27 integrate
.. //depot/projects/ia64/release/Makefile#83 integrate
.. //depot/projects/ia64/share/examples/diskless/clone_root#3 integrate
.. //depot/projects/ia64/share/mk/bsd.cpu.mk#23 integrate
.. //depot/projects/ia64/sys/amd64/amd64/bios.c#1 branch
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#25 integrate
.. //depot/projects/ia64/sys/amd64/include/pc/bios.h#1 branch
.. //depot/projects/ia64/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/ia64/sys/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/ia64/sys/arm/arm/cpufunc.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/db_trace.c#4 integrate
.. //depot/projects/ia64/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/exception.S#3 integrate
.. //depot/projects/ia64/sys/arm/arm/genassym.c#2 integrate
.. //depot/projects/ia64/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/ia64/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/irq_dispatch.S#2 integrate
.. //depot/projects/ia64/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/ia64/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/nexus_io.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/support.S#3 integrate
.. //depot/projects/ia64/sys/arm/arm/swtch.S#2 integrate
.. //depot/projects/ia64/sys/arm/arm/sys_machdep.c#3 integrate
.. //depot/projects/ia64/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/ia64/sys/arm/arm/uio_machdep.c#2 integrate
.. //depot/projects/ia64/sys/arm/arm/vm_machdep.c#3 integrate
.. //depot/projects/ia64/sys/arm/conf/IQ31244#1 branch
.. //depot/projects/ia64/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/ia64/sys/arm/include/asm.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/bus.h#3 integrate
.. //depot/projects/ia64/sys/arm/include/intr.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/param.h#5 integrate
.. //depot/projects/ia64/sys/arm/include/pcb.h#3 integrate
.. //depot/projects/ia64/sys/arm/include/pmap.h#3 integrate
.. //depot/projects/ia64/sys/arm/include/profile.h#4 integrate
.. //depot/projects/ia64/sys/arm/include/pte.h#2 integrate
.. //depot/projects/ia64/sys/arm/include/signal.h#5 integrate
.. //depot/projects/ia64/sys/arm/include/sysarch.h#1 branch
.. //depot/projects/ia64/sys/arm/include/vmparam.h#3 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0.c#3 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#3 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irq.S#2 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/ia64/sys/arm/sa11x0/std.sa11x0#2 integrate
.. //depot/projects/ia64/sys/arm/xscale/i80321/files.i80321#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/files.iq31244#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_intr.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_mcu.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_pci.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_space.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321_timer.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321reg.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/i80321var.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321reg.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/iq80321var.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/obio.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/obio_space.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/obiovar.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/std.i80321#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/std.iq31244#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch
.. //depot/projects/ia64/sys/arm/xscale/xscalereg.h#1 branch
.. //depot/projects/ia64/sys/arm/xscale/xscalevar.h#1 branch
.. //depot/projects/ia64/sys/boot/ia64/Makefile#2 integrate
.. //depot/projects/ia64/sys/boot/ia64/libski/Makefile#10 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/acpi_stub.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#8 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/copy.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/delay.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/devicename.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/efi_stub.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#10 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/exit.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/libski.h#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/module.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.S#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/sal_stub.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/skiconsole.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/skifs.c#3 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/ssc.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/libski/time.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/ski/Makefile#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/acpi_stub.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/bootinfo.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/conf.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/copy.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/delay.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/devicename.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/efi_stub.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/elf_freebsd.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/exit.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/ldscript.ia64#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/libski.h#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/main.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/pal_stub.S#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/sal_stub.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/skiconsole.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/skifs.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/skiload.cmd#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/ssc.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/start.S#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/time.c#1 branch
.. //depot/projects/ia64/sys/boot/ia64/ski/version#1 branch
.. //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#15 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/conf.c#4 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/ldscript.ia64#3 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/main.c#5 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/skiload.cmd#2 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/start.S#3 delete
.. //depot/projects/ia64/sys/boot/ia64/skiload/version#3 delete
.. //depot/projects/ia64/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/ia64/sys/conf/files.amd64#21 integrate
.. //depot/projects/ia64/sys/conf/kern.pre.mk#30 integrate
.. //depot/projects/ia64/sys/conf/ldscript.arm#2 integrate
.. //depot/projects/ia64/sys/conf/options.arm#2 integrate
.. //depot/projects/ia64/sys/dev/em/if_em_hw.c#15 integrate
.. //depot/projects/ia64/sys/dev/fb/vga.c#17 integrate
.. //depot/projects/ia64/sys/dev/pci/pci.c#40 integrate
.. //depot/projects/ia64/sys/dev/syscons/scvgarndr.c#7 integrate
.. //depot/projects/ia64/sys/dev/syscons/syscons.c#30 integrate
.. //depot/projects/ia64/sys/isa/syscons_isa.c#11 integrate
.. //depot/projects/ia64/sys/kern/imgact_elf.c#40 integrate
.. //depot/projects/ia64/sys/kern/kern_exit.c#55 integrate
.. //depot/projects/ia64/sys/kern/kern_resource.c#32 integrate
.. //depot/projects/ia64/sys/sys/proc.h#86 integrate
.. //depot/projects/ia64/usr.sbin/Makefile#64 integrate

Differences ...

==== //depot/projects/ia64/lib/csu/arm/crt1.c#3 (text+ko) ====

@@ -96,9 +96,8 @@
 "	b	 __start  ");
 /* ARGSUSED */
 void
-__start(int argc, char **argv, char **env,
-    const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void),
-    struct ps_strings *ps_strings)
+__start(int argc, char **argv, char **env, struct ps_strings *ps_strings,
+    const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void))
 {
 	const char *s;
 
@@ -118,7 +117,6 @@
 		atexit(cleanup);
 	else
 		_init_tls();
-
 #ifdef GCRT
 	atexit(_mcleanup);
 #endif
@@ -136,4 +134,4 @@
 __asm__(".previous");
 #endif
 
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.2 2004/08/15 16:18:51 dfr Exp $\"");
+__asm__(".ident\t\"$FreeBSD: src/lib/csu/arm/crt1.c,v 1.3 2004/09/23 23:00:51 cognet Exp $\"");

==== //depot/projects/ia64/lib/csu/arm/crti.S#2 (text+ko) ====

@@ -1,5 +1,21 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.1 2004/05/14 12:19:04 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/csu/arm/crti.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
+
+	.section .init,"ax",%progbits
+	.align 4
+	.globl	_init
+	.type	_init,%function
+_init:
+	mov	ip, sp
+	stmdb	sp!, {fp, ip, lr, pc}
+	sub	fp, ip, #4
+
+	.section .fini,"ax",%progbits
+	.align 4
+	.globl	_fini
+	.type	_fini,%function
+_fini:
+	mov	ip, sp
+	stmdb	sp!, {fp, ip, lr, pc}
+	sub	fp, ip, #4
 
-ENTRY(_init)
-ENTRY(_fini)

==== //depot/projects/ia64/lib/csu/arm/crtn.S#2 (text+ko) ====

@@ -1,4 +1,9 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.1 2004/05/14 12:19:04 cognet Exp $");
-.section init
-.section fini
+__FBSDID("$FreeBSD: src/lib/csu/arm/crtn.S,v 1.2 2004/09/23 23:00:51 cognet Exp $");
+	.section .init,"ax",%progbits
+	ldmea	fp, {fp, sp, pc}
+	mov	pc, lr
+
+	.section .fini,"ax",%progbits
+	ldmea	fp, {fp, sp, pc}
+	mov	pc, lr

==== //depot/projects/ia64/lib/libc/arm/gen/Makefile.inc#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.3 2004/07/18 21:23:38 das Exp $
+# $FreeBSD: src/lib/libc/arm/gen/Makefile.inc,v 1.4 2004/09/23 23:12:57 cognet Exp $
 
-SRCS+=	_ctx_start.S _setjmp.S alloca.S fabs.c \
+SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
 	infinity.c ldexp.c makecontext.c modf.c \
 	setjmp.S signalcontext.c sigsetjmp.S divsi3.S

==== //depot/projects/ia64/lib/libc/arm/gen/setjmp.S#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.1 2004/05/14 12:04:30 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.2 2004/09/23 23:13:46 cognet Exp $");
 /*
  * C library -- setjmp, longjmp
  *
@@ -48,16 +48,14 @@
 ENTRY(setjmp)
 	/* Block all signals and retrieve the old signal mask */
 	stmfd	sp!, {r0, r14}
-	mov	r0, #0x00000000
+	add	r2, r0, #4 /* oset */
+	mov	r0, #0x00000001 /* SIG_BLOCK */
+	mov	r1, #0 /* set */
 
-	bl	PIC_SYM(_C_LABEL(sigblock), PLT)
-	mov	r1, r0
+	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
 
 	ldmfd	sp!, {r0, r14}
 
-	/* Store signal mask */
-	str	r1, [r0, #(25 * 4)]
-
 	ldr	r1, .Lsetjmp_magic
 	str	r1, [r0], #4
 
@@ -88,14 +86,16 @@
 	bne	botch
 
 	/* Fetch signal mask */
-	ldr	r2, [r0, #(25 * 4)]
+	add	r2, r0, #4
 
 	/* Set signal mask */
 	stmfd	sp!, {r0, r1, r14}
 	sub	sp, sp, #4	/* align the stack */
 
-	mov	r0, r2
-	bl	PIC_SYM(_C_LABEL(sigsetmask), PLT)
+	mov	r1, r2
+	mov	r0, #3 /* SIG_SETMASK */
+	mov	r2, #0
+	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
 
 	add	sp, sp, #4	/* unalign the stack */
 	ldmfd	sp!, {r0, r1, r14} 

==== //depot/projects/ia64/lib/libc/arm/string/memcmp.S#2 (text+ko) ====

@@ -64,7 +64,7 @@
 
 #include <machine/asm.h>
 
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcmp.S,v 1.2 2004/09/23 23:10:56 cognet Exp $");
 
 ENTRY(memcmp)
 	mov	ip, r0
@@ -83,8 +83,8 @@
 	bne	.Lmemcmp_bytewise2	/* Badly aligned. Do it the slow way */
 
 	/* Word-align the addresses, if necessary */
-	and	r3, r1, #0x03
-	rsbs	r3, r3, #0x03
+	sub	r3, r1, #0x05
+	ands	r3, r3, #0x03
 	add	r3, r3, r3, lsl #1
 	addne	pc, pc, r3, lsl #3
 	nop

==== //depot/projects/ia64/lib/libc/arm/string/memcpy_xscale.S#2 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy_xscale.S,v 1.2 2004/09/23 23:11:32 cognet Exp $");
 
 /* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
 ENTRY(memcpy)
@@ -135,7 +135,7 @@
 .Lmemcpy_w_lessthan128:
 	adds	r2, r2, #0x80		/* Adjust for extra sub */
 	ldmeqfd	sp!, {r4-r9}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	subs	r2, r2, #0x20
 	blt	.Lmemcpy_w_lessthan32
 
@@ -160,7 +160,7 @@
 .Lmemcpy_w_lessthan32:
 	adds	r2, r2, #0x20		/* Adjust for extra sub */
 	ldmeqfd	sp!, {r4-r9}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 
 	and	r4, r2, #0x18
 	rsbs	r4, r4, #0x18
@@ -187,11 +187,11 @@
 
 	/* Less than 8 bytes remaining */
 	ldmfd	sp!, {r4-r9}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	subs	r2, r2, #0x04
 	ldrge	ip, [r1], #0x04
 	strge	ip, [r3], #0x04
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	addlt	r2, r2, #0x04
 	ldrb	ip, [r1], #0x01
 	cmp	r2, #0x02
@@ -200,7 +200,7 @@
 	ldrgtb	ip, [r1]
 	strgeb	r2, [r3], #0x01
 	strgtb	ip, [r3]
-	mov	pc, lr
+	bx	lr
 
 
 /*
@@ -254,7 +254,7 @@
 
 	adds	r2, r2, #0x10         
 	ldmeqfd	sp!, {r4-r7}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	subs	r2, r2, #0x04
 	sublt	r1, r1, #0x03
 	blt	.Lmemcpy_bad_done
@@ -315,7 +315,7 @@
 
 	adds	r2, r2, #0x10         
 	ldmeqfd	sp!, {r4-r7}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	subs	r2, r2, #0x04
 	sublt	r1, r1, #0x02
 	blt	.Lmemcpy_bad_done
@@ -376,7 +376,7 @@
 
 	adds	r2, r2, #0x10         
 	ldmeqfd	sp!, {r4-r7}
-	moveq	pc, lr			/* Return now if done */
+	bxeq	lr			/* Return now if done */
 	subs	r2, r2, #0x04
 	sublt	r1, r1, #0x01
 	blt	.Lmemcpy_bad_done
@@ -401,7 +401,7 @@
 .Lmemcpy_bad_done:
 	ldmfd	sp!, {r4-r7}
 	adds	r2, r2, #0x04
-	moveq	pc, lr
+	bxeq	lr
 	ldrb	ip, [r1], #0x01
 	cmp	r2, #0x02
 	ldrgeb	r2, [r1], #0x01
@@ -409,7 +409,7 @@
 	ldrgtb	ip, [r1]
 	strgeb	r2, [r3], #0x01
 	strgtb	ip, [r3]
-	mov	pc, lr
+	bx	lr
 
 
 /*
@@ -421,7 +421,7 @@
 #ifndef _STANDALONE
 	add	pc, pc, r2, lsl #2
 	nop
-	mov	pc, lr			/* 0x00 */
+	bx	lr			/* 0x00 */
 	b	.Lmemcpy_bytewise	/* 0x01 */
 	b	.Lmemcpy_bytewise	/* 0x02 */
 	b	.Lmemcpy_bytewise	/* 0x03 */
@@ -442,7 +442,7 @@
 	strb	ip, [r3], #0x01
 	ldrneb	ip, [r1], #0x01
 	bne	1b
-	mov	pc, lr
+	bx	lr
 
 #ifndef _STANDALONE
 /******************************************************************************
@@ -463,7 +463,7 @@
  */
 	ldr	r2, [r1]
 	str	r2, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -479,7 +479,7 @@
 	orr	r3, r3, r2, lsl #24	/* r3 = 3210 */
 #endif
 	str	r3, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -494,7 +494,7 @@
 #endif
 	orr	r3, r2, r3, lsl #16
 	str	r3, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -510,7 +510,7 @@
 	orr	r3, r3, r2, lsl #8	/* r3 = 3210 */
 #endif
 	str	r3, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -529,7 +529,7 @@
 	strb	r1, [r0, #0x03]
 #endif
 	strh	r3, [r0, #0x01]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -541,7 +541,7 @@
 	strb	r2, [r0]
 	strh	r3, [r0, #0x01]
 	strb	r1, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -562,7 +562,7 @@
 #endif
 	strh	r2, [r0, #0x01]
 	strb	r3, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -574,7 +574,7 @@
 	strb	r2, [r0]
 	strh	r3, [r0, #0x01]
 	strb	r1, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -590,7 +590,7 @@
 	mov	r3, r2, lsr #16
 	strh	r3, [r0, #0x02]
 #endif
-	mov	pc, lr
+	bx	 lr
 	LMEMCPY_4_PAD
 
 /*
@@ -608,7 +608,7 @@
 	orr	r2, r2, r3, lsl #8	/* r2 = xx32 */
 #endif
 	strh	r2, [r0, #0x02]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -618,7 +618,7 @@
 	ldrh	r3, [r1, #0x02]
 	strh	r2, [r0]
 	strh	r3, [r0, #0x02]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -636,7 +636,7 @@
 	orr	r3, r3, r2, lsr #24	/* r3 = 3210 */
 #endif
 	strh	r3, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -656,7 +656,7 @@
 	strh	r3, [r0, #0x01]
 	strb	r1, [r0, #0x03]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -668,7 +668,7 @@
 	strb	r2, [r0]
 	strh	r3, [r0, #0x01]
 	strb	r1, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -693,7 +693,7 @@
 	mov	r3, r3, lsr #8		/* r3 = ...3 */
 	strb	r3, [r0, #0x03]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 /*
@@ -705,7 +705,7 @@
 	strb	r2, [r0]
 	strh	r3, [r0, #0x01]
 	strb	r1, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_4_PAD
 
 
@@ -729,7 +729,7 @@
 	ldrh	r3, [r1, #0x04]
 	str	r2, [r0]
 	strh	r3, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -747,7 +747,7 @@
 	mov	r3, r3, lsr #8		/* BE:r3 = .345  LE:r3 = .x54 */
 	str	r2, [r0]
 	strh	r3, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -766,7 +766,7 @@
 	str	r2, [r0]
 	strh	r1, [r0, #0x04]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -788,7 +788,7 @@
 #endif
 	str	r2, [r0]
 	strh	r1, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -811,7 +811,7 @@
 #endif
 	strh	r3, [r0, #0x03]
 	strb	r2, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -825,7 +825,7 @@
 	strh	r3, [r0, #0x01]
 	strh	ip, [r0, #0x03]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -852,7 +852,7 @@
 	orr	r3, r3, r1, lsl #8	/* r3 = 4321 */
 	strh	r3, [r0, #0x01]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -866,7 +866,7 @@
 	strh	r3, [r0, #0x01]
 	strh	ip, [r0, #0x03]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -887,7 +887,7 @@
 	strh	r3, [r0]
 	str	r2, [r0, #0x02]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -905,7 +905,7 @@
 #endif
 	strh	r1, [r0]
 	str	r2, [r0, #0x02]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -915,7 +915,7 @@
 	ldr	r3, [r1, #0x02]
 	strh	r2, [r0]
 	str	r3, [r0, #0x02]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -935,7 +935,7 @@
 #endif
 	strh	r3, [r0]
 	str	r1, [r0, #0x02]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -956,7 +956,7 @@
 #endif
 	str	r2, [r0, #0x01]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -970,7 +970,7 @@
 	strh	r3, [r0, #0x01]
 	strh	ip, [r0, #0x03]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -991,7 +991,7 @@
 #endif
 	str	r2, [r0, #0x01]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 /*
@@ -1003,7 +1003,7 @@
 	strb	r2, [r0]
 	str	r3, [r0, #0x01]
 	strb	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_6_PAD
 
 
@@ -1027,7 +1027,7 @@
 	ldr	r3, [r1, #0x04]
 	str	r2, [r0]
 	str	r3, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1048,7 +1048,7 @@
 #endif
 	str	r3, [r0]
 	str	r2, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1068,7 +1068,7 @@
 #endif
 	str	r2, [r0]
 	str	r3, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1089,7 +1089,7 @@
 #endif
 	str	r3, [r0]
 	str	r2, [r0, #0x04]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1114,7 +1114,7 @@
 #endif
 	strh	r1, [r0, #0x01]
 	str	r3, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1128,7 +1128,7 @@
 	strh	r3, [r0, #0x01]
 	str	ip, [r0, #0x03]
 	strb	r1, [r0, #0x07]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1156,7 +1156,7 @@
 #endif
 	strh	ip, [r0, #0x01]
 	str	r3, [r0, #0x03]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1177,7 +1177,7 @@
 #endif
 	str	r2, [r0, #0x03]
 	strb	r1, [r0, #0x07]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1197,7 +1197,7 @@
 #endif
 	str	r2, [r0, #0x02]
 	strh	r3, [r0, #0x06]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1220,7 +1220,7 @@
 #endif
 	str	r1, [r0, #0x02]
 	strh	r3, [r0, #0x06]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1232,7 +1232,7 @@
 	strh	r2, [r0]
 	str	ip, [r0, #0x02]
 	strh	r3, [r0, #0x06]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1255,7 +1255,7 @@
 #endif
 	str	r3, [r0, #0x02]
 	strh	r2, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1280,7 +1280,7 @@
 	orr	r2, r2, r3, lsl #24	/* r2 = 4321 */
 	str	r2, [r0, #0x01]
 #endif
-	mov	pc, lr
+	bx	 lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1301,7 +1301,7 @@
 #endif
 	str	r2, [r0, #0x01]
 	strb	r1, [r0, #0x07]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1329,7 +1329,7 @@
 #endif
 	str	ip, [r0, #0x01]
 	strh	r1, [r0, #0x05]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /*
@@ -1343,7 +1343,7 @@
 	str	ip, [r0, #0x01]
 	strh	r3, [r0, #0x05]
 	strb	r1, [r0, #0x07]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_8_PAD
 
 /******************************************************************************
@@ -1368,7 +1368,7 @@
 	str	r2, [r0]
 	str	r3, [r0, #0x04]
 	str	r1, [r0, #0x08]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1396,7 +1396,7 @@
 #endif
 	str	r2, [r0, #0x04]
 	str	r1, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1423,7 +1423,7 @@
 #endif
 	str	r3, [r0, #0x04]
 	str	r1, [r0, #0x08]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1451,7 +1451,7 @@
 #endif
 	str	r3, [r0, #0x04]
 	str	r1, [r0, #0x08]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1480,7 +1480,7 @@
 	str	r2, [r0, #0x03]
 	str	r1, [r0, #0x07]
 	strb	ip, [r0, #0x0b]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1496,7 +1496,7 @@
 	str	ip, [r0, #0x03]
 	str	r2, [r0, #0x07]
 	strb	r1, [r0, #0x0b]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1530,7 +1530,7 @@
 	str	r3, [r0, #0x03]
 	str	r2, [r0, #0x07]
 	strb	r1, [r0, #0x0b]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1560,7 +1560,7 @@
 	str	r3, [r0, #0x03]
 	str	ip, [r0, #0x07]
 	strb	r1, [r0, #0x0b]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1586,7 +1586,7 @@
 	str	r1, [r0, #0x02]
 	str	r3, [r0, #0x06]
 	strh	r2, [r0, #0x0a]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1615,7 +1615,7 @@
 	str	r2, [r0, #0x02]
 	str	r3, [r0, #0x06]
 	strh	r1, [r0, #0x0a]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1629,7 +1629,7 @@
 	str	r3, [r0, #0x02]
 	str	ip, [r0, #0x06]
 	strh	r1, [r0, #0x0a]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1658,7 +1658,7 @@
 	str	r2, [r0, #0x06]
 	str	r3, [r0, #0x02]
 	strh	r1, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1692,7 +1692,7 @@
 	mov	r1, r1, lsr #16		/* r1 = ...B */
 	strb	r1, [r0, #0x0b]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1722,7 +1722,7 @@
 	str	r3, [r0, #0x05]
 	str	ip, [r0, #0x01]
 	strb	r1, [r0]
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1763,7 +1763,7 @@
 	strh	ip, [r0, #0x09]
 	strb	r1, [r0, #0x0b]
 #endif
-	mov	pc, lr
+	bx	lr
 	LMEMCPY_C_PAD
 
 /*
@@ -1779,5 +1779,5 @@
 	str	ip, [r0, #0x05]

>>> TRUNCATED FOR MAIL (1000 lines) <<<

More information about the p4-projects mailing list