mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +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>
138 lines
2.7 KiB
C
138 lines
2.7 KiB
C
#ifndef __M68K_ENTRY_H
|
|
#define __M68K_ENTRY_H
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/page.h>
|
|
|
|
/*
|
|
* Stack layout in 'ret_from_exception':
|
|
*
|
|
* This allows access to the syscall arguments in registers d1-d5
|
|
*
|
|
* 0(sp) - d1
|
|
* 4(sp) - d2
|
|
* 8(sp) - d3
|
|
* C(sp) - d4
|
|
* 10(sp) - d5
|
|
* 14(sp) - a0
|
|
* 18(sp) - a1
|
|
* 1C(sp) - a2
|
|
* 20(sp) - d0
|
|
* 24(sp) - orig_d0
|
|
* 28(sp) - stack adjustment
|
|
* 2C(sp) - sr
|
|
* 2E(sp) - pc
|
|
* 32(sp) - format & vector
|
|
*/
|
|
|
|
/*
|
|
* 97/05/14 Andreas: Register %a2 is now set to the current task throughout
|
|
* the whole kernel.
|
|
*/
|
|
|
|
/* the following macro is used when enabling interrupts */
|
|
#if defined(MACH_ATARI_ONLY)
|
|
/* block out HSYNC on the atari */
|
|
#define ALLOWINT (~0x400)
|
|
#define MAX_NOINT_IPL 3
|
|
#else
|
|
/* portable version */
|
|
#define ALLOWINT (~0x700)
|
|
#define MAX_NOINT_IPL 0
|
|
#endif /* machine compilation types */
|
|
|
|
#ifdef __ASSEMBLY__
|
|
|
|
#define curptr a2
|
|
|
|
LFLUSH_I_AND_D = 0x00000808
|
|
LSIGTRAP = 5
|
|
|
|
/* process bits for task_struct.ptrace */
|
|
PT_TRACESYS_OFF = 3
|
|
PT_TRACESYS_BIT = 1
|
|
PT_PTRACED_OFF = 3
|
|
PT_PTRACED_BIT = 0
|
|
PT_DTRACE_OFF = 3
|
|
PT_DTRACE_BIT = 2
|
|
|
|
#define SAVE_ALL_INT save_all_int
|
|
#define SAVE_ALL_SYS save_all_sys
|
|
#define RESTORE_ALL restore_all
|
|
/*
|
|
* This defines the normal kernel pt-regs layout.
|
|
*
|
|
* regs a3-a6 and d6-d7 are preserved by C code
|
|
* the kernel doesn't mess with usp unless it needs to
|
|
*/
|
|
|
|
/*
|
|
* a -1 in the orig_d0 field signifies
|
|
* that the stack frame is NOT for syscall
|
|
*/
|
|
.macro save_all_int
|
|
clrl %sp@- | stk_adj
|
|
pea -1:w | orig d0
|
|
movel %d0,%sp@- | d0
|
|
moveml %d1-%d5/%a0-%a1/%curptr,%sp@-
|
|
.endm
|
|
|
|
.macro save_all_sys
|
|
clrl %sp@- | stk_adj
|
|
movel %d0,%sp@- | orig d0
|
|
movel %d0,%sp@- | d0
|
|
moveml %d1-%d5/%a0-%a1/%curptr,%sp@-
|
|
.endm
|
|
|
|
.macro restore_all
|
|
moveml %sp@+,%a0-%a1/%curptr/%d1-%d5
|
|
movel %sp@+,%d0
|
|
addql #4,%sp | orig d0
|
|
addl %sp@+,%sp | stk adj
|
|
rte
|
|
.endm
|
|
|
|
#define SWITCH_STACK_SIZE (6*4+4) /* includes return address */
|
|
|
|
#define SAVE_SWITCH_STACK save_switch_stack
|
|
#define RESTORE_SWITCH_STACK restore_switch_stack
|
|
#define GET_CURRENT(tmp) get_current tmp
|
|
|
|
.macro save_switch_stack
|
|
moveml %a3-%a6/%d6-%d7,%sp@-
|
|
.endm
|
|
|
|
.macro restore_switch_stack
|
|
moveml %sp@+,%a3-%a6/%d6-%d7
|
|
.endm
|
|
|
|
.macro get_current reg=%d0
|
|
movel %sp,\reg
|
|
andw #-THREAD_SIZE,\reg
|
|
movel \reg,%curptr
|
|
movel %curptr@,%curptr
|
|
.endm
|
|
|
|
#else /* C source */
|
|
|
|
#define STR(X) STR1(X)
|
|
#define STR1(X) #X
|
|
|
|
#define PT_OFF_ORIG_D0 0x24
|
|
#define PT_OFF_FORMATVEC 0x32
|
|
#define PT_OFF_SR 0x2C
|
|
#define SAVE_ALL_INT \
|
|
"clrl %%sp@-;" /* stk_adj */ \
|
|
"pea -1:w;" /* orig d0 = -1 */ \
|
|
"movel %%d0,%%sp@-;" /* d0 */ \
|
|
"moveml %%d1-%%d5/%%a0-%%a2,%%sp@-"
|
|
#define GET_CURRENT(tmp) \
|
|
"movel %%sp,"#tmp"\n\t" \
|
|
"andw #-"STR(THREAD_SIZE)","#tmp"\n\t" \
|
|
"movel "#tmp",%%a2\n\t" \
|
|
"movel %%a2@,%%a2"
|
|
|
|
#endif
|
|
|
|
#endif /* __M68K_ENTRY_H */
|