CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: pgoyette Date: Thu Nov 5 03:48:51 UTC 2015 Modified Files: src/sys/arch/cesfic/cesfic: machdep.c Log Message: Remove superfluous #includes - nothing depends on them To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cesfic/cesfic/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/machdep.c diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.65 src/sys/arch/cesfic/cesfic/machdep.c:1.66 --- src/sys/arch/cesfic/cesfic/machdep.c:1.65 Mon Mar 24 18:56:43 2014 +++ src/sys/arch/cesfic/cesfic/machdep.c Thu Nov 5 03:48:51 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.65 2014/03/24 18:56:43 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.66 2015/11/05 03:48:51 pgoyette Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2014/03/24 18:56:43 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.66 2015/11/05 03:48:51 pgoyette Exp $"); #include "opt_bufcache.h" #include "opt_ddb.h" @@ -72,15 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include #include #include -#ifdef SYSVMSG -#include -#endif -#ifdef SYSVSEM -#include -#endif -#ifdef SYSVSHM -#include -#endif #include #include
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Mar 15 11:53:30 UTC 2014 Modified Files: src/sys/arch/cesfic/cesfic: locore.s Log Message: Use common m68k/busaddrerr.s for bus error and address error handlers. No binary changes on GENERIC. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cesfic/cesfic/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.31 src/sys/arch/cesfic/cesfic/locore.s:1.32 --- src/sys/arch/cesfic/cesfic/locore.s:1.31 Sun Mar 9 16:28:43 2014 +++ src/sys/arch/cesfic/cesfic/locore.s Sat Mar 15 11:53:30 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.31 2014/03/09 16:28:43 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.32 2014/03/15 11:53:30 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -387,191 +387,10 @@ Lmainreturned: */ #include -#if defined(M68040) || defined(M68060) -ENTRY_NOPROFILE(addrerr4060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+8),%sp@- - clrl %sp@- | dummy code - movl #T_ADDRERR,%sp@- | mark address error - jra _ASM_LABEL(faultstkadj) | and deal with it -#endif - -#if defined(M68060) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movel %sp@(FR_HW+12),%d0 | FSLW - btst #2,%d0 | branch prediction error? - jeq Lnobpe - movc %cacr,%d2 - orl #IC60_CABC,%d2 | clear all branch cache entries - movc %d2,%cacr - movl %d0,%d1 - andl #0x7ffd,%d1 - jeq _ASM_LABEL(faultstkadjnotrap2) -Lnobpe: -| we need to adjust for misaligned addresses - movl %sp@(FR_HW+8),%d1 | grab VA - btst #27,%d0 | check for mis-aligned access - jeq Lberr3 | no, skip - addl #28,%d1 | yes, get into next page - | operand case: 3, - | instruction case: 4+12+12 - andl #PG_FRAME,%d1| and truncate -Lberr3: - movl %d1,%sp@- - movl %d0,%sp@- | code is FSLW now. - andw #0x1f80,%d0 - jeq Lberr60 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr60: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif -#if defined(M68040) -ENTRY_NOPROFILE(buserr40) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - movl %sp@(FR_HW+20),%d1 | get fault address - moveq #0,%d0 - movw %sp@(FR_HW+12),%d0 | get SSW - btst #11,%d0 | check for mis-aligned - jeq Lbe1stpg | no skip - addl #3,%d1 | get into next page - andl #PG_FRAME,%d1 | and truncate -Lbe1stpg: - movl %d1,%sp@- | pass fault address. - movl %d0,%sp@- | pass SSW as code - btst #10,%d0 | test ATC - jeq Lberr40 | it is a bus error - movl #T_MMUFLT,%sp@- | show that we are an MMU fault - jra _ASM_LABEL(faultstkadj) | and deal with it -Lberr40: - tstl _C_LABEL(nofault) | catch bus error? - jeq Lisberr | no, handle as usual - movl _C_LABEL(nofault),%sp@- | yes, - jbsr _C_LABEL(longjmp) | longjmp(nofault) - /* NOTREACHED */ -#endif - -#if defined(M68020) || defined(M68030) -ENTRY_NOPROFILE(busaddrerr2030) - clrl %sp@- | stack adjust count - moveml #0x,%sp@- | save user registers - movl %usp,%a0 | save the user SP - movl %a0,%sp@(FR_SP) | in the savearea - moveq #0,%d0 - movw %sp@(FR_HW+10),%d0 | grab SSW for fault processing - btst #12,%d0 | RB set? - jeq LbeX0 | no, test RC - bset #14,%d0 | yes, must set FB - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX0: - btst #13,%d0 | RC set? - jeq LbeX1 | no, skip - bset #15,%d0 | yes, must set FC - movw %d0,%sp@(FR_HW+10) | for hardware too -LbeX1: - btst #8,%d0 | data fault? - jeq Lbe0 | no, check for hard cases - movl %sp@(FR_HW+16),%d1 | fault address is as given in frame - jra Lbe10 | thats it -Lbe0: - btst #4,%sp@(FR_HW+6) | long (type B) stack frame? - jne Lbe4 | yes, go handle - movl %sp@(FR_HW+2),%d1 | no, can use save PC - btst #14,%d0 | FB set? - jeq Lbe3 | no, try FC - addql #4,%d1 | yes, adjust address - jra Lbe10 | done -Lbe3: - btst #15,%d0 | FC set? - jeq Lbe10 | no, done - addql #2,%d1 | yes, adjust address - jra Lbe10 | done -Lbe4: - movl %sp@(FR_HW+36),%d1 | long format, use stage B address - btst #15,%d0 | FC set? - jeq Lbe10 | no, all done - subql #2,%d1 | yes, adjust address -Lbe10: - movl %d1,%sp@- | push fault VA - movl %d0,%sp@- | and padded SSW - movw %sp@(FR_HW+8+6),%d0 | get frame format/vector offset - andw #0x0FFF,%d0 | clear out frame format - cmpw #12,%d0 | address error v
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: drochner Date: Wed Aug 8 16:29:50 UTC 2012 Modified Files: src/sys/arch/cesfic/cesfic: machdep.c Log Message: build fix for gcc -fno-common, from Radoslaw Kujawa To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/cesfic/cesfic/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/machdep.c diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.63 src/sys/arch/cesfic/cesfic/machdep.c:1.64 --- src/sys/arch/cesfic/cesfic/machdep.c:1.63 Fri Jul 27 05:36:10 2012 +++ src/sys/arch/cesfic/cesfic/machdep.c Wed Aug 8 16:29:50 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.63 2012/07/27 05:36:10 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.64 2012/08/08 16:29:50 drochner Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2012/07/27 05:36:10 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2012/08/08 16:29:50 drochner Exp $"); #include "opt_bufcache.h" #include "opt_ddb.h" @@ -119,7 +119,7 @@ struct vm_map *phys_map = NULL; * Declare these as initialized data so we can patch them. */ /*int maxmem;*/ /* max memory per process */ -int physmem = MAXMEM; /* max supported memory, changes to actual */ +extern int physmem; /* max supported memory, changes to actual */ extern u_int lowram;
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Dec 25 16:11:12 UTC 2010 Modified Files: src/sys/arch/cesfic/cesfic: pmap_bootstrap.c Log Message: Fix another fatal typo. sigh. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/pmap_bootstrap.c diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.28 --- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27 Sat Dec 25 14:42:59 2010 +++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Sat Dec 25 16:11:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.28 2010/12/25 16:11:11 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.28 2010/12/25 16:11:11 tsutsui Exp $"); #include #include @@ -215,7 +215,7 @@ i = SG4_LEV1SIZE + (nl1desc * SG4_LEV2SIZE); ste = (st_entry_t *)kstpa; ste = &ste[i + SG4_LEV2SIZE - NPTEPG / SG4_LEV3SIZE * 2]; - epte = &ste[NPTEPG / SG4_LEV3SIZE]; + este = &ste[NPTEPG / SG4_LEV3SIZE]; protoste = kptmpa | SG_U | SG_RW | SG_V; while (ste < este) { *ste++ = protoste;
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: skrll Date: Thu Feb 25 07:15:25 UTC 2010 Modified Files: src/sys/arch/cesfic/cesfic: locore.s Log Message: s/cpu_fork/cpu_lwp_fork/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cesfic/cesfic/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.21 src/sys/arch/cesfic/cesfic/locore.s:1.22 --- src/sys/arch/cesfic/cesfic/locore.s:1.21 Sun Dec 13 11:24:02 2009 +++ src/sys/arch/cesfic/cesfic/locore.s Thu Feb 25 07:15:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.21 2009/12/13 11:24:02 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.22 2010/02/25 07:15:25 skrll Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -359,7 +359,7 @@ jbsr _C_LABEL(fic_init) /* - * Create a fake exception frame so that cpu_fork() can copy it. + * Create a fake exception frame so that cpu_lwp_fork() can copy it. * main() nevers returns; we exit to user mode from a forked process * later on. */
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: tsutsui Date: Sat Dec 5 15:31:07 UTC 2009 Modified Files: src/sys/arch/cesfic/cesfic: pmap_bootstrap.c Log Message: Replace obsolete vm_offset_t with appropriate paddr_t or vaddr_t. (why gcc compiles these differ!?) To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/pmap_bootstrap.c diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.21 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.22 --- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.21 Fri Dec 4 18:55:13 2009 +++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Sat Dec 5 15:31:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.21 2009/12/04 18:55:13 tsutsui Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.22 2009/12/05 15:31:07 tsutsui Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.21 2009/12/04 18:55:13 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.22 2009/12/05 15:31:07 tsutsui Exp $"); #include #include @@ -55,7 +55,7 @@ extern char *etext; extern paddr_t avail_start, avail_end; -void pmap_bootstrap(vm_offset_t, vm_offset_t); +void pmap_bootstrap(paddr_t, paddr_t); /* * Special purpose kernel virtual addresses, used for mapping @@ -81,9 +81,9 @@ * XXX a PIC compiler would make this much easier. */ void -pmap_bootstrap(vm_offset_t nextpa, vm_offset_t firstpa) +pmap_bootstrap(paddr_t nextpa, paddr_t firstpa) { - vm_offset_t kstpa, kptpa, kptmpa, lkptpa, lwp0upa; + paddr_t kstpa, kptpa, kptmpa, lkptpa, lwp0upa; u_int nptpages, kstsize; st_entry_t protoste, *ste; pt_entry_t protopte, *pte, *epte; @@ -371,14 +371,14 @@ * To work around this, we move avail_end back one more * page so the msgbuf can be preserved. */ - RELOC(avail_start, vm_offset_t) = nextpa; - RELOC(avail_end, vm_offset_t) = firstpa + RELOC(avail_start, paddr_t) = nextpa; + RELOC(avail_end, paddr_t) = firstpa + m68k_ptob(RELOC(physmem, int)) - m68k_round_page(MSGBUFSIZE) - PAGE_SIZE; /* if that start of last page??? */ - RELOC(virtual_avail, vm_offset_t) = + RELOC(virtual_avail, vaddr_t) = KERNBASE + (nextpa - firstpa); - RELOC(virtual_end, vm_offset_t) = VM_MAX_KERNEL_ADDRESS; + RELOC(virtual_end, vaddr_t) = VM_MAX_KERNEL_ADDRESS; /* * Initialize protection array. @@ -440,7 +440,7 @@ * Allocate some fixed, special purpose kernel virtual addresses */ { - vm_offset_t va = RELOC(virtual_avail, vm_offset_t); + vaddr_t va = RELOC(virtual_avail, vaddr_t); RELOC(CADDR1, void *) = (void *)va; va += PAGE_SIZE; @@ -450,6 +450,6 @@ va += PAGE_SIZE; RELOC(msgbufaddr, void *) = (void *)va; va += m68k_round_page(MSGBUFSIZE); - RELOC(virtual_avail, vm_offset_t) = va; + RELOC(virtual_avail, vaddr_t) = va; } }
CVS commit: src/sys/arch/cesfic/cesfic
Module Name:src Committed By: thorpej Date: Wed Aug 26 00:20:20 UTC 2009 Modified Files: src/sys/arch/cesfic/cesfic: machdep.c Log Message: Make this compile again (64-bit dev_t printf format). To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/cesfic/cesfic/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/machdep.c diff -u src/sys/arch/cesfic/cesfic/machdep.c:1.50 src/sys/arch/cesfic/cesfic/machdep.c:1.51 --- src/sys/arch/cesfic/cesfic/machdep.c:1.50 Sat Aug 15 23:44:58 2009 +++ src/sys/arch/cesfic/cesfic/machdep.c Wed Aug 26 00:20:20 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.50 2009/08/15 23:44:58 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.51 2009/08/26 00:20:20 thorpej Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2009/08/15 23:44:58 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.51 2009/08/26 00:20:20 thorpej Exp $"); #include "opt_bufcache.h" #include "opt_ddb.h" @@ -531,7 +531,7 @@ dump = bdev->d_dump; blkno = dumplo; - printf("\ndumping to dev 0x%x, offset %ld\n", dumpdev, dumplo); + printf("\ndumping to dev %"PRIx64", offset %ld\n", dumpdev, dumplo); printf("dump "); maddr = lowram;