![Sam Ravnborg](/assets/img/avatar_default.png)
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>
87 lines
3.7 KiB
C
87 lines
3.7 KiB
C
#ifndef _M68K_USER_H
|
|
#define _M68K_USER_H
|
|
|
|
/* Core file format: The core file is written in such a way that gdb
|
|
can understand it and provide useful information to the user (under
|
|
linux we use the 'trad-core' bfd). There are quite a number of
|
|
obstacles to being able to view the contents of the floating point
|
|
registers, and until these are solved you will not be able to view the
|
|
contents of them. Actually, you can read in the core file and look at
|
|
the contents of the user struct to find out what the floating point
|
|
registers contain.
|
|
The actual file contents are as follows:
|
|
UPAGE: 1 page consisting of a user struct that tells gdb what is present
|
|
in the file. Directly after this is a copy of the task_struct, which
|
|
is currently not used by gdb, but it may come in useful at some point.
|
|
All of the registers are stored as part of the upage. The upage should
|
|
always be only one page.
|
|
DATA: The data area is stored. We use current->end_text to
|
|
current->brk to pick up all of the user variables, plus any memory
|
|
that may have been malloced. No attempt is made to determine if a page
|
|
is demand-zero or if a page is totally unused, we just cover the entire
|
|
range. All of the addresses are rounded in such a way that an integral
|
|
number of pages is written.
|
|
STACK: We need the stack information in order to get a meaningful
|
|
backtrace. We need to write the data from (esp) to
|
|
current->start_stack, so we round each of these off in order to be able
|
|
to write an integer number of pages.
|
|
The minimum core file size is 3 pages, or 12288 bytes.
|
|
*/
|
|
|
|
struct user_m68kfp_struct {
|
|
unsigned long fpregs[8*3]; /* fp0-fp7 registers */
|
|
unsigned long fpcntl[3]; /* fp control regs */
|
|
};
|
|
|
|
/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
|
|
is still the layout used by user (the new pt_regs doesn't have
|
|
all registers). */
|
|
struct user_regs_struct {
|
|
long d1,d2,d3,d4,d5,d6,d7;
|
|
long a0,a1,a2,a3,a4,a5,a6;
|
|
long d0;
|
|
long usp;
|
|
long orig_d0;
|
|
short stkadj;
|
|
short sr;
|
|
long pc;
|
|
short fmtvec;
|
|
short __fill;
|
|
};
|
|
|
|
|
|
/* When the kernel dumps core, it starts by dumping the user struct -
|
|
this will be used by gdb to figure out where the data and stack segments
|
|
are within the file, and what virtual addresses to use. */
|
|
struct user{
|
|
/* We start with the registers, to mimic the way that "memory" is returned
|
|
from the ptrace(3,...) function. */
|
|
struct user_regs_struct regs; /* Where the registers are actually stored */
|
|
/* ptrace does not yet supply these. Someday.... */
|
|
int u_fpvalid; /* True if math co-processor being used. */
|
|
/* for this mess. Not yet used. */
|
|
struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */
|
|
/* The rest of this junk is to help gdb figure out what goes where */
|
|
unsigned long int u_tsize; /* Text segment size (pages). */
|
|
unsigned long int u_dsize; /* Data segment size (pages). */
|
|
unsigned long int u_ssize; /* Stack segment size (pages). */
|
|
unsigned long start_code; /* Starting virtual address of text. */
|
|
unsigned long start_stack; /* Starting virtual address of stack area.
|
|
This is actually the bottom of the stack,
|
|
the top of the stack is always found in the
|
|
esp register. */
|
|
long int signal; /* Signal that caused the core dump. */
|
|
int reserved; /* No longer used */
|
|
unsigned long u_ar0; /* Used by gdb to help find the values for */
|
|
/* the registers. */
|
|
struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */
|
|
unsigned long magic; /* To uniquely identify a core file */
|
|
char u_comm[32]; /* User command that was responsible */
|
|
};
|
|
#define NBPG 4096
|
|
#define UPAGES 1
|
|
#define HOST_TEXT_START_ADDR (u.start_code)
|
|
#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
|
|
|
|
#endif
|