Date: Sun, 20 Feb 2005 20:29:51 GMT From: John-Mark Gurney <jmg@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 71399 for review Message-ID: <200502202029.j1KKTpnO054676@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=71399 Change 71399 by jmg@jmg_carbon on 2005/02/20 20:29:14 remove the conditionals on the fixup, w/ them the TS-7200 won't properly relocate... Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#3 (text+ko) ==== @@ -160,13 +160,14 @@ subs r2, r2, #4 bgt .L1 + /* fix up the pc to be at KERNVIRTADDR */ ldr r4, =KERNVIRTADDR cmp pc, r4 #if KERNVIRTADDR > KERNPHYSADDR - ldrlt r4, =KERNVIRTADDR - ldrlt r5, =KERNPHYSADDR - sublt r4, r4, r5 - addlt pc, pc, r4 + ldr r4, =KERNVIRTADDR + ldr r5, =KERNPHYSADDR + sub r4, r4, r5 + add pc, pc, r4 #else ldrgt r4, =KERNPHYSADDR ldrgt r5, =KERNVIRTADDR
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502202029.j1KKTpnO054676>