[src/netbsd-9]: src/sys/arch/mac68k/mac68k Pull up following revision(s) (req...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a40df6e6546e
branches:  netbsd-9
changeset: 962013:a40df6e6546e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Apr 27 10:27:30 2021 +0000

description:
Pull up following revision(s) (requested by rin in ticket #1255):

        sys/arch/mac68k/mac68k/locore.s: revision 1.174

Fix DJMEMCMAX option for Quadra/Centris 650/800.
- Use jeq instead of jra for conditional branch.
- Use cmpl instead of cmp (= cmpw) for int variables.

Now, my Quadra 800 recognizes full 520MB memory!

diffstat:

 sys/arch/mac68k/mac68k/locore.s |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (36 lines):

diff -r 36a1bb5fd10d -r a40df6e6546e sys/arch/mac68k/mac68k/locore.s
--- a/sys/arch/mac68k/mac68k/locore.s   Mon Apr 26 18:36:07 2021 +0000
+++ b/sys/arch/mac68k/mac68k/locore.s   Tue Apr 27 10:27:30 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.171 2018/12/19 13:57:48 maxv Exp $        */
+/*     $NetBSD: locore.s,v 1.171.4.1 2021/04/27 10:27:30 martin Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -275,16 +275,16 @@
 
 #if defined(DJMEMCMAX)
        movl    %a3,%sp@-
-       cmp     #MACH_MACC610,_C_LABEL(machineid)
-       jra     Ldjmemc610
-       cmp     #MACH_MACQ610,_C_LABEL(machineid)
-       jra     Ldjmemc610
-       cmp     #MACH_MACC650,_C_LABEL(machineid)
-       jra     Ldjmemccfg
-       cmp     #MACH_MACQ650,_C_LABEL(machineid)
-       jra     Ldjmemccfg
-       cmp     #MACH_MACQ800,_C_LABEL(machineid)
-       jra     Ldjmemccfg
+       cmpl    #MACH_MACC610,_C_LABEL(machineid)
+       jeq     Ldjmemc610
+       cmpl    #MACH_MACQ610,_C_LABEL(machineid)
+       jeq     Ldjmemc610
+       cmpl    #MACH_MACC650,_C_LABEL(machineid)
+       jeq     Ldjmemccfg
+       cmpl    #MACH_MACQ650,_C_LABEL(machineid)
+       jeq     Ldjmemccfg
+       cmpl    #MACH_MACQ800,_C_LABEL(machineid)
+       jeq     Ldjmemccfg
 
        jra     Lnodjmemc