mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +00:00
49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
155 lines
4.4 KiB
C
155 lines
4.4 KiB
C
/*
|
|
* linux/include/asm/traps.h
|
|
*
|
|
* Copyright (C) 1993 Hamish Macdonald
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef _M68KNOMMU_TRAPS_H
|
|
#define _M68KNOMMU_TRAPS_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
typedef void (*e_vector)(void);
|
|
|
|
extern e_vector vectors[];
|
|
extern void init_vectors(void);
|
|
extern void enable_vector(unsigned int irq);
|
|
extern void disable_vector(unsigned int irq);
|
|
extern void ack_vector(unsigned int irq);
|
|
|
|
#endif
|
|
|
|
#define VEC_BUSERR (2)
|
|
#define VEC_ADDRERR (3)
|
|
#define VEC_ILLEGAL (4)
|
|
#define VEC_ZERODIV (5)
|
|
#define VEC_CHK (6)
|
|
#define VEC_TRAP (7)
|
|
#define VEC_PRIV (8)
|
|
#define VEC_TRACE (9)
|
|
#define VEC_LINE10 (10)
|
|
#define VEC_LINE11 (11)
|
|
#define VEC_RESV1 (12)
|
|
#define VEC_COPROC (13)
|
|
#define VEC_FORMAT (14)
|
|
#define VEC_UNINT (15)
|
|
#define VEC_SPUR (24)
|
|
#define VEC_INT1 (25)
|
|
#define VEC_INT2 (26)
|
|
#define VEC_INT3 (27)
|
|
#define VEC_INT4 (28)
|
|
#define VEC_INT5 (29)
|
|
#define VEC_INT6 (30)
|
|
#define VEC_INT7 (31)
|
|
#define VEC_SYS (32)
|
|
#define VEC_TRAP1 (33)
|
|
#define VEC_TRAP2 (34)
|
|
#define VEC_TRAP3 (35)
|
|
#define VEC_TRAP4 (36)
|
|
#define VEC_TRAP5 (37)
|
|
#define VEC_TRAP6 (38)
|
|
#define VEC_TRAP7 (39)
|
|
#define VEC_TRAP8 (40)
|
|
#define VEC_TRAP9 (41)
|
|
#define VEC_TRAP10 (42)
|
|
#define VEC_TRAP11 (43)
|
|
#define VEC_TRAP12 (44)
|
|
#define VEC_TRAP13 (45)
|
|
#define VEC_TRAP14 (46)
|
|
#define VEC_TRAP15 (47)
|
|
#define VEC_FPBRUC (48)
|
|
#define VEC_FPIR (49)
|
|
#define VEC_FPDIVZ (50)
|
|
#define VEC_FPUNDER (51)
|
|
#define VEC_FPOE (52)
|
|
#define VEC_FPOVER (53)
|
|
#define VEC_FPNAN (54)
|
|
#define VEC_FPUNSUP (55)
|
|
#define VEC_UNIMPEA (60)
|
|
#define VEC_UNIMPII (61)
|
|
#define VEC_USER (64)
|
|
|
|
#define VECOFF(vec) ((vec)<<2)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* Status register bits */
|
|
#define PS_T (0x8000)
|
|
#define PS_S (0x2000)
|
|
#define PS_M (0x1000)
|
|
#define PS_C (0x0001)
|
|
|
|
/* structure for stack frames */
|
|
|
|
struct frame {
|
|
struct pt_regs ptregs;
|
|
union {
|
|
struct {
|
|
unsigned long iaddr; /* instruction address */
|
|
} fmt2;
|
|
struct {
|
|
unsigned long effaddr; /* effective address */
|
|
} fmt3;
|
|
struct {
|
|
unsigned long effaddr; /* effective address */
|
|
unsigned long pc; /* pc of faulted instr */
|
|
} fmt4;
|
|
struct {
|
|
unsigned long effaddr; /* effective address */
|
|
unsigned short ssw; /* special status word */
|
|
unsigned short wb3s; /* write back 3 status */
|
|
unsigned short wb2s; /* write back 2 status */
|
|
unsigned short wb1s; /* write back 1 status */
|
|
unsigned long faddr; /* fault address */
|
|
unsigned long wb3a; /* write back 3 address */
|
|
unsigned long wb3d; /* write back 3 data */
|
|
unsigned long wb2a; /* write back 2 address */
|
|
unsigned long wb2d; /* write back 2 data */
|
|
unsigned long wb1a; /* write back 1 address */
|
|
unsigned long wb1dpd0; /* write back 1 data/push data 0*/
|
|
unsigned long pd1; /* push data 1*/
|
|
unsigned long pd2; /* push data 2*/
|
|
unsigned long pd3; /* push data 3*/
|
|
} fmt7;
|
|
struct {
|
|
unsigned long iaddr; /* instruction address */
|
|
unsigned short int1[4]; /* internal registers */
|
|
} fmt9;
|
|
struct {
|
|
unsigned short int1;
|
|
unsigned short ssw; /* special status word */
|
|
unsigned short isc; /* instruction stage c */
|
|
unsigned short isb; /* instruction stage b */
|
|
unsigned long daddr; /* data cycle fault address */
|
|
unsigned short int2[2];
|
|
unsigned long dobuf; /* data cycle output buffer */
|
|
unsigned short int3[2];
|
|
} fmta;
|
|
struct {
|
|
unsigned short int1;
|
|
unsigned short ssw; /* special status word */
|
|
unsigned short isc; /* instruction stage c */
|
|
unsigned short isb; /* instruction stage b */
|
|
unsigned long daddr; /* data cycle fault address */
|
|
unsigned short int2[2];
|
|
unsigned long dobuf; /* data cycle output buffer */
|
|
unsigned short int3[4];
|
|
unsigned long baddr; /* stage B address */
|
|
unsigned short int4[2];
|
|
unsigned long dibuf; /* data cycle input buffer */
|
|
unsigned short int5[3];
|
|
unsigned ver : 4; /* stack frame version # */
|
|
unsigned int6:12;
|
|
unsigned short int7[18];
|
|
} fmtb;
|
|
} un;
|
|
};
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* _M68KNOMMU_TRAPS_H */
|