From 79357f087df7a6f3fa9e3b1ae618d3ca2e977a77 Mon Sep 17 00:00:00 2001 From: "Dale S. Rahn" Date: Sat, 24 May 1997 03:02:33 +0000 Subject: mvme88k will not make release, but just as well make the source as close as possible. --- sys/arch/mvme88k/conf/Makefile.mvme88k | 3 +-- sys/arch/mvme88k/mvme88k/disksubr.c | 2 +- sys/arch/mvme88k/mvme88k/eh.S | 1 + sys/arch/mvme88k/mvme88k/locore.S | 6 ++++-- sys/arch/mvme88k/mvme88k/locore_asm_routines.S | 1 + sys/arch/mvme88k/mvme88k/m88100_fp.S | 1 + sys/arch/mvme88k/mvme88k/process.S | 1 + 7 files changed, 10 insertions(+), 5 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 8281022afc6..76569d72b01 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,5 +1,5 @@ # @(#)Makefile.hp300 7.10 (Berkeley) 6/27/91 -# $Id: Makefile.mvme88k,v 1.1 1997/03/03 19:31:53 rahnds Exp $ +# $Id: Makefile.mvme88k,v 1.2 1997/05/24 03:02:28 rahnds Exp $ # # Makefile for NetBSD # @@ -110,7 +110,6 @@ SYSTEM_LD_TAIL= @size $@; chmod 755 $@; \ assym.s: genassym ./genassym >assym.s - cp assym.s ${.CURDIR}/../../include genassym: ${HOSTCC} -static ${INCLUDES} ${IDENT} ${PARAM} -Dmvme88k -Dm88k \ diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c index 4d507e1e0f5..2aebdc8bd46 100644 --- a/sys/arch/mvme88k/mvme88k/disksubr.c +++ b/sys/arch/mvme88k/mvme88k/disksubr.c @@ -280,7 +280,7 @@ bounds_check_with_label(bp, lp, wlabel) /* beyond partition? */ if (bp->b_blkno + sz > blockpersec(p->p_size, lp)) { sz = blockpersec(p->p_size, lp) - bp->b_blkno; - if (bp->b_blkno == maxsz) { + if (sz == 0) { /* if exactly at end of disk, return an EOF */ bp->b_resid = bp->b_bcount; return(0); diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S index c16d5244a9f..9319d1f5b83 100644 --- a/sys/arch/mvme88k/mvme88k/eh.S +++ b/sys/arch/mvme88k/mvme88k/eh.S @@ -214,6 +214,7 @@ #define ASSEMBLER #endif +#include "assym.s" #include /* for T_ defines */ #include diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S index d247e39c4c2..72f5313d967 100644 --- a/sys/arch/mvme88k/mvme88k/locore.S +++ b/sys/arch/mvme88k/mvme88k/locore.S @@ -59,9 +59,10 @@ #define ASSEMBLER #endif +#include "assym.s" #include "machine/asm.h" -#include "machine/m88100.h" #include "machine/trap.h" +#include "machine/m88100.h" #include "machine/psl.h" #include "machine/vmparam.h" /* INTSTACK_SIZE */ @@ -82,6 +83,7 @@ text LABEL(_kernelstart) +LABEL(_kernel_text) LABEL(_start) LABEL(start) br _start_text @@ -294,7 +296,7 @@ _msgsw: global _intstack global _intstack_end _intstack: - space 4 * NBPG /* 16K */ + space (4 * NBPG) /* 16K */ _intstack_end: /* diff --git a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S index 5735e79a8a1..25b43bb2583 100644 --- a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S +++ b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S @@ -38,6 +38,7 @@ # define ASSEMBLER #endif +#include "assym.s" #include #include #include diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S index 8cbddddfa62..20bdb27245b 100644 --- a/sys/arch/mvme88k/mvme88k/m88100_fp.S +++ b/sys/arch/mvme88k/mvme88k/m88100_fp.S @@ -31,6 +31,7 @@ #define ASSEMBLER +#include "assym.s" #include #include diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S index 38db2e85b6f..40dfb3c4045 100644 --- a/sys/arch/mvme88k/mvme88k/process.S +++ b/sys/arch/mvme88k/mvme88k/process.S @@ -32,6 +32,7 @@ #define ASSEMBLER #endif +#include "assym.s" #include "machine/asm.h" #include "machine/psl.h" -- cgit v1.2.3