Fix FRV, ELF-FDPIC and NOMMU stuff [try #2]
Subsystems (2)
cover Fix FRV, ELF-FDPIC and NOMMU stuff [try #2]
The attached patches:
(1) Fix compilation errors and other problems in the FRV arch and the ELF-FDPIC binfmt driver.
(2) Fix a problem with the NOMMU ramfs filesystem when executing binaries stored therein.
(3) Add ELF-FDPIC coredump support.
(4) Make the FRV arch make use of the asm-offsets stuff.
In [try #2] the following change has been made:
(*) Inclusions of <linux/config.h> added by the patches have been dropped as
they're not necessary.
PATCH 1/5 FDPIC: Fix FDPIC compile errors [try #2]
From: David Howells <[email protected]>
The attached patch fixes FDPIC compile errors
---
fs/binfmt_elf_fdpic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/binfmt_elf_fdpic.c +1 -0
@@ -459,6 +459,7 @@ #endif*/ hwcap =ELF_HWCAP ; k_platform =ELF_PLATFORM ; + u_platform =NULL ;if (k_platform) { platform_len =strlen (k_platform) +1 ;
Re: [PATCH 1/5] FDPIC: Fix FDPIC compile errors [try #2]
Quoted 16 lines · David Howells
From: David Howells <[email protected]>
The attached patch fixes FDPIC compile errors
Signed-off-by David Howells <[email protected]>---
fs/binfmt_elf_fdpic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)fs/binfmt_elf_fdpic.c +0
-0
fs/binfmt_elf_fdpic.c #endif · line 465
Quoted 7 lines
fs/binfmt_elf_fdpic.c +1
-0@@ -459,6 +459,7 @@ #endif*/ hwcap =ELF_HWCAP ; k_platform =ELF_PLATFORM ; + u_platform =NULL ;if (k_platform) { platform_len =strlen (k_platform) +1 ;
Methinks it actually fixes a warning, which was promoted to an error by -Werror. Which was fixed by adding an unneeded assignment, all becasue gcc is dumb.
Re: [PATCH 1/5] FDPIC: Fix FDPIC compile errors [try #2]
Quoted 3 lines · Andrew Morton
Methinks it actually fixes a warning, which was promoted to an error by -Werror. Which was fixed by adding an unneeded assignment, all becasue gcc is dumb.
No -Werror in fs/ neither in -mm not in -linus?
Sam
PATCH 2/5 FRV: Fix FRV arch compile errors [try #2]
In reply to David HowellsFrom: David Howells <[email protected]>
The attached patch fixes some FRV arch compile errors, including:
(*) Marking nr_kernel_pages as __initdata so that references to it end up
being properly calculated rather than being assumed to be in the small data section (and thus calculated wrt the GP register). Not doing this causes the linker to emit errors as the offset is too big to fit into the load instruction.
(*) Move pm_power_off into an unconditionally compiled .c file as it's now
unconditionally accessed.
(*) Declare frv_change_cmode() in a header file rather than in a .c file, and
declare it asmlinkage.
---
arch/frv/kernel/local.h | 3 +++ arch/frv/kernel/pm.c | 5 ----- arch/frv/kernel/process.c | 4 ++++ include/linux/bootmem.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-)
arch/frv/kernel/local.h +3 -0
@@ -51,6 +51,9 @@ #endif/* time.c */ extern void time_divisor_init (void ); +/* cmode.S */ +extern asmlinkage void frv_change_cmode(int); +#endif /* __ASSEMBLY__ */ #endif /* _FRV_LOCAL_H */
arch/frv/kernel/pm.c +0 -5
@@ -26,11 +26,6 @@ #include <asm/mb86943a.h>#include "local.h" -void (*pm_power_off)(void ); -EXPORT_SYMBOL (pm_power_off); - -extern void frv_change_cmode (int ); -/* * Debug macros */
arch/frv/kernel/process.c +4 -0
@@ -10,6 +10,7 @@* 2 of the License, or (at your option) any later version. */ +#include <linux/module.h> #include <linux/errno.h> #include <linux/sched.h> #include <linux/kernel.h>
@@ -38,6 +39,9 @@ asmlinkage void ret_from_fork(void);#include <asm/pgalloc.h> +void (*pm_power_off)(void ); +EXPORT_SYMBOL (pm_power_off); +struct task_struct *alloc_task_struct (void ) {struct task_struct *p =kmalloc (THREAD_SIZE ,GFP_KERNEL );
include/linux/bootmem.h +1 -1
@@ -91,7 +91,7 @@ static inline void *alloc_remap(int nid, }#endif -extern unsigned long nr_kernel_pages; +extern unsigned long __initdata nr_kernel_pages;extern unsigned long nr_all_pages; extern void *__init alloc_large_system_hash(const char *tablename,
PATCH 3/5 NOMMU: Fix execution off of ramfs with mmap() [try #2]
In reply to David HowellsFrom: David Howells <[email protected]>
Fix execution through the FDPIC binfmt of programs stored on ramfs by preventing the ramfs mmap() returning successfully on a private mapping of a ramfs file. This causes NOMMU mmap to make a copy of the mapped portion of the file and map that instead.
This could be improved by granting direct mapping access to read-only private mappings for which the data is stored on a contiguous run of pages. However, this is only likely to be the case if the file was extended with truncate before being written.
ramfs is left to map the file directly for shared mappings so that SYSV IPC and POSIX shared memory both still work.
---
fs/ramfs/file-nommu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ramfs/file-nommu.c +2 -2
@@ -283,9 +283,9 @@ unsigned long ramfs_nommu_get_unmapped_a/*****************************************************************************/ /* -* set up a mapping +* set up a mapping for shared memory segments */ int ramfs_nommu_mmap (struct file *file,struct vm_area_struct *vma) { -return 0 ; +return vma->vm_flags &VM_SHARED ?0 : -ENOSYS ; }
PATCH 4/5 FDPIC: Add coredump capability for the ELF-FDPIC binfmt [try #2]
In reply to David HowellsFrom: David Howells <[email protected]>
Add coredump capability for the ELF-FDPIC binfmt.
---
arch/frv/kernel/process.c | 8 + fs/binfmt_elf_fdpic.c | 681 +++++++++++++++++++++++++++++++++++++++++++++ include/asm-frv/elf.h | 6 include/linux/elfcore.h | 10 + 4 files changed, 697 insertions(+), 8 deletions(-)
arch/frv/kernel/process.c +8 -0
@@ -371,3 +371,11 @@ int elf_check_arch(const struct elf32_hdreturn 1 ; } + +int dump_fpu (struct pt_regs *regs,elf_fpregset_t *fpregs) +{ +memcpy (fpregs, + ¤t->thread.user->f, +sizeof (current->thread.user->f)); +return 1 ; +}
fs/binfmt_elf_fdpic.c +677 -4
718 lines not on this page · raw message
include/asm-frv/elf.h +2 -4
@@ -64,7 +64,7 @@ typedef unsigned long elf_greg_t;#define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))typedef elf_greg_t elf_gregset_t [ELF_NGREG ]; -typedef struct fpmedia_struct elf_fpregset_t ; +typedef struct user_fpmedia_regs elf_fpregset_t ;/* * This is used to ensure we don't load something for the wrong architecture.
@@ -116,6 +116,7 @@ do { \ } while(0)#define USE_ELF_CORE_DUMP +#define ELF_FDPIC_CORE_EFLAGS EF_FRV_FDPIC#define ELF_EXEC_PAGESIZE 16384/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
@@ -125,9 +126,6 @@ #define ELF_EXEC_PAGESIZE 16384#define ELF_ET_DYN_BASE 0x08000000UL -#define ELF_CORE_COPY_REGS (pr_reg, regs) \ - memcpy(&pr_reg[0], ®s->sp, 31 * sizeof(uint32_t)); -/* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */
include/linux/elfcore.h +10 -0
@@ -60,6 +60,16 @@ #if 0long pr_instr;/* Current instruction */ #endif elf_gregset_t pr_reg;/* GP registers */ +#ifdef CONFIG_BINFMT_ELF_FDPIC +/* When using FDPIC, the loadmap addresses need to be communicated +* to GDB in order for GDB to do the necessary relocations. The +* fields (below) used to communicate this information are placed +* immediately after ``pr_reg'', so that the loadmap addresses may +* be viewed as part of the register set if so desired. +*/ +unsigned long pr_exec_fdpic_loadmap; +unsigned long pr_interp_fdpic_loadmap; +#endif int pr_fpvalid;/* True if math co-processor being used. */ };
PATCH 5/5 FRV: Introduce asm-offsets for FRV arch [try #2]
In reply to David HowellsFrom: David Howells <[email protected]>
Introduce the use of asm-offsets into the FRV architecture.
---
arch/frv/kernel/asm-offsets.c | 116 ++++++++++++++++++++++++++++++ arch/frv/kernel/break.S | 34 +++++---- arch/frv/kernel/debug-stub.c | 13 ++- arch/frv/kernel/entry.S | 1 arch/frv/kernel/gdb-stub.c | 159 +++++++++++++++++++++++------------------ arch/frv/kernel/head.S | 1 arch/frv/kernel/process.c | 3 + arch/frv/kernel/switch_to.S | 3 + arch/frv/kernel/traps.c | 25 +++--- include/asm-frv/gdb-stub.h | 22 ++++++ include/asm-frv/ptrace.h | 12 +-- include/asm-frv/registers.h | 97 ++++++++++--------------- include/asm-frv/thread_info.h | 24 +----- 13 files changed, 313 insertions(+), 197 deletions(-)
arch/frv/kernel/asm-offsets.c +115 -1
@@ -1 +1,115 @@ -/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */ +/* +* Generate definitions needed by assembly language modules. +* This code generates raw asm output which is post-processed +* to extract and format the required data. +*/ + +#include <linux/sched.h> +#include <linux/signal.h> +#include <linux/personality.h> +#include <asm/registers.h> +#include <asm/ucontext.h> +#include <asm/processor.h> +#include <asm/thread_info.h> +#include <asm/gdb-stub.h> + +#define DEFINE (sym, val) \ + asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + +#define DEF_PTREG (sym, reg) \ + asm volatile("\n->" #sym " %0 offsetof(struct pt_regs, " #reg ")" \ + : : "i" (offsetof(struct pt_regs, reg))) + +#define DEF_IREG (sym, reg) \ + asm volatile("\n->" #sym " %0 offsetof(struct user_context, " #reg ")" \ + : : "i" (offsetof(struct user_context, reg))) + +#define DEF_FREG (sym, reg) \ + asm volatile("\n->" #sym " %0 offsetof(struct user_context, " #reg ")" \ + : : "i" (offsetof(struct user_context, reg))) + +#define DEF_0REG (sym, reg) \ + asm volatile("\n->" #sym " %0 offsetof(struct frv_frame0, " #reg ")" \ + : : "i" (offsetof(struct frv_frame0, reg))) + +#define BLANK () asm volatile("\n->" : : ) + +#define OFFSET (sym, str, mem) \ + DEFINE(sym, offsetof(struct str, mem)); + +void foo (void ) +{ +/* offsets into the thread_info structure */ +OFFSET (TI_TASK , thread_info, task); +OFFSET (TI_EXEC_DOMAIN , thread_info, exec_domain); +OFFSET (TI_FLAGS , thread_info, flags); +OFFSET (TI_STATUS , thread_info, status); +OFFSET (TI_CPU , thread_info, cpu); +OFFSET (TI_PREEMPT_COUNT , thread_info, preempt_count); +OFFSET (TI_ADDR_LIMIT , thread_info, addr_limit); +OFFSET (TI_RESTART_BLOCK , thread_info, restart_block); +BLANK (); + +/* offsets into register file storage */ +DEF_PTREG (REG_PSR , psr); +DEF_PTREG (REG_ISR , isr); +DEF_PTREG (REG_CCR , ccr); +DEF_PTREG (REG_CCCR , cccr); +DEF_PTREG (REG_LR , lr); +DEF_PTREG (REG_LCR , lcr); +DEF_PTREG (REG_PC , pc); +DEF_PTREG (REG__STATUS , __status); +DEF_PTREG (REG_SYSCALLNO , syscallno); +DEF_PTREG (REG_ORIG_GR8 , orig_gr8); +DEF_PTREG (REG_GNER0 , gner0); +DEF_PTREG (REG_GNER1 , gner1); +DEF_PTREG (REG_IACC0 , iacc0); +DEF_PTREG (REG_TBR , tbr); +DEF_PTREG (REG_GR0 , tbr); +DEFINE (REG__END ,sizeof (struct pt_regs )); +BLANK (); + +DEF_0REG (REG_DCR , debug.dcr); +DEF_0REG (REG_IBAR0 , debug.ibar[0 ]); +DEF_0REG (REG_DBAR0 , debug.dbar[0 ]); +DEF_0REG (REG_DBDR00 , debug.dbdr[0 ][0 ]); +DEF_0REG (REG_DBMR00 , debug.dbmr[0 ][0 ]); +BLANK (); + +DEF_IREG (__INT_GR0, i.gr[0 ]); +DEF_FREG (__USER_FPMEDIA, f); +DEF_FREG (__FPMEDIA_FR0, f.fr[0 ]); +DEF_FREG (__FPMEDIA_FNER0, f.fner[0 ]); +DEF_FREG (__FPMEDIA_MSR0, f.msr[0 ]); +DEF_FREG (__FPMEDIA_ACC0, f.acc[0 ]); +DEF_FREG (__FPMEDIA_ACCG0, f.accg[0 ]); +DEF_FREG (__FPMEDIA_FSR0, f.fsr[0 ]); +BLANK (); + +DEFINE (NR_PT_REGS ,sizeof (struct pt_regs ) /4 ); +DEFINE (NR_USER_INT_REGS ,sizeof (struct user_int_regs ) /4 ); +DEFINE (NR_USER_FPMEDIA_REGS ,sizeof (struct user_fpmedia_regs ) /4 ); +DEFINE (NR_USER_CONTEXT ,sizeof (struct user_context ) /4 ); +DEFINE (FRV_FRAME0_SIZE ,sizeof (struct frv_frame0 )); +BLANK (); + +/* offsets into thread_struct */ +OFFSET (__THREAD_FRAME, thread_struct, frame); +OFFSET (__THREAD_CURR, thread_struct, curr); +OFFSET (__THREAD_SP, thread_struct, sp); +OFFSET (__THREAD_FP, thread_struct, fp); +OFFSET (__THREAD_LR, thread_struct, lr); +OFFSET (__THREAD_PC, thread_struct, pc); +OFFSET (__THREAD_GR16, thread_struct, gr[0 ]); +OFFSET (__THREAD_SCHED_LR, thread_struct, sched_lr); +OFFSET (__THREAD_FRAME0, thread_struct, frame0); +OFFSET (__THREAD_USER, thread_struct, user); +BLANK (); + +/* offsets into frv_debug_status */ +OFFSET (DEBUG_BPSR , frv_debug_status, bpsr); +OFFSET (DEBUG_DCR , frv_debug_status, dcr); +OFFSET (DEBUG_BRR , frv_debug_status, brr); +OFFSET (DEBUG_NMAR , frv_debug_status, nmar); +BLANK (); +}
arch/frv/kernel/break.S +19 -15
@@ -9,11 +9,11 @@ * 2 of the License, or (at your option) any later version. */ -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/setup.h> #include <asm/segment.h> #include <asm/ptrace.h> +#include <asm/thread_info.h> #include <asm/spr-regs.h> #include <asm/errno.h>
@@ -23,13 +23,11 @@ # the break handler has its own stack # .section .bss.stack .globl __break_user_context - .balign 8192 + .balign THREAD_SIZE __break_stack: - .space (8192 - (USER_CONTEXT_SIZE + REG__DEBUG_XTRA)) & ~7 -__break_stack_tos: - .space REG__DEBUG_XTRA -__break_user_context: - .space USER_CONTEXT_SIZE + .space THREAD_SIZE - FRV_FRAME0_SIZE +__break_frame_0: + .space FRV_FRAME0_SIZE # # miscellaneous variables
@@ -74,8 +72,8 @@ #ifdef CONFIG_MMU #endif LEDS 0x1001,gr31 - sethi.p %hi(__break_user_context),gr31 - setlo %lo(__break_user_context),gr31 + sethi.p %hi(__break_frame_0),gr31 + setlo %lo(__break_frame_0),gr31 stdi gr2,@(gr31,#REG_GR(2)) movsg ccr,gr3
@@ -585,8 +583,8 @@ __break_continue: # set up the kernel stack pointer sti sp,@(gr31,#REG_SP) - sethi.p %hi(__break_stack_tos),sp - setlo %lo(__break_stack_tos),sp + sethi.p %hi(__break_frame_0),sp + setlo %lo(__break_frame_0),sp # finish building the exception frame stdi gr4 ,@(gr31,#REG_GR(4))
@@ -651,9 +649,12 @@ #endif movsg nmar,gr5 movsg dcr,gr6 - stdi gr4 ,@(gr31,#REG_BRR) - sti gr19,@(gr31,#REG_BPSR) - sti.p gr6 ,@(gr31,#REG_DCR) + sethi.p %hi(__debug_status),gr7 + setlo %lo(__debug_status),gr7 + + stdi gr4 ,@(gr7,#DEBUG_BRR) + sti gr19,@(gr7,#DEBUG_BPSR) + sti.p gr6 ,@(gr7,#DEBUG_DCR) # trap exceptions during break handling and disable h/w breakpoints/watchpoints sethi %hi(DCR_EBE),gr5
@@ -698,7 +699,10 @@ #endif lddi @(gr31,#REG_PSR) ,gr22 ldi @(gr31,#REG_PC) ,gr21 ldi @(gr31,#REG_TBR) ,gr20 - ldi.p @(gr31,#REG_DCR) ,gr6 + + sethi.p %hi(__debug_status),gr6 + setlo %lo(__debug_status),gr6 + ldi.p @(gr6,#DEBUG_DCR) ,gr6 andi gr22,#PSR_S,gr19 /* rebuild BPSR */ andi.p gr22,#PSR_ET,gr5
arch/frv/kernel/debug-stub.c +6 -7
@@ -39,10 +39,9 @@ do { \gdbstub_do_rx (); \ }while (!FLOWCTL_QUERY (LINE )) -static void __init debug_stub_init(void); +struct frv_debug_status __debug_status; -extern asmlinkage void __break_hijack_kernel_event(void); -extern asmlinkage void __break_hijack_kernel_event_breaks_here(void); +static void __init debug_stub_init (void );/*****************************************************************************/ /*
@@ -67,7 +66,7 @@ asmlinkage void debug_stub(void)__set_HSR (0 , hsr0 & ~HSR0_ETMD );/* disable single stepping */ - __debug_regs->dcr &= ~DCR_SE ; + __debug_status.dcr &= ~DCR_SE ;/* kernel mode can propose an exception be handled in debug mode by jumping to a special * location */
@@ -76,8 +75,8 @@ asmlinkage void debug_stub(void)* the top kernel context */ *__debug_frame = *__frame; __frame = __debug_frame->next_frame; - __debug_regs->brr = (__debug_frame->tbr &TBR_TT ) <<12 ; - __debug_regs->brr |=BRR_EB ; + __debug_status.brr = (__debug_frame->tbr &TBR_TT ) <<12 ; + __debug_status.brr |=BRR_EB ; }if (__debug_frame->pc == (unsigned long ) __debug_bug_trap +4 ) {
@@ -124,7 +123,7 @@ static void __init debug_stub_init(void) __debug_frame->pc = (unsigned long ) start_kernel;/* enable the debug events we want to trap */ - __debug_regs->dcr =DCR_EBE ; + __debug_status.dcr =DCR_EBE ;#ifdef CONFIG_GDBSTUB gdbstub_init ();
arch/frv/kernel/entry.S +0 -1
@@ -27,7 +27,6 @@ * */ -#include <linux/sys.h> #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/setup.h>
arch/frv/kernel/gdb-stub.c +90 -69
423 lines not on this page · raw message
arch/frv/kernel/head.S +1 -0
@@ -11,6 +11,7 @@ #include <linux/threads.h> #include <linux/linkage.h> +#include <asm/thread_info.h> #include <asm/ptrace.h> #include <asm/page.h> #include <asm/spr-regs.h>
arch/frv/kernel/process.c +2 -1
@@ -26,6 +26,7 @@ #include <linux/elf.h>#include <linux/reboot.h> #include <linux/interrupt.h> +#include <asm/asm-offsets.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/setup.h>
@@ -207,7 +208,7 @@ int copy_thread(int nr, unsigned long cl regs0 = __kernel_frame0_ptr; childregs0 = (struct pt_regs *) - (task_stack_page (p) +THREAD_SIZE -USER_CONTEXT_SIZE ); + (task_stack_page (p) +THREAD_SIZE -FRV_FRAME0_SIZE ); childregs = childregs0;/* set up the userspace frame (the only place that the USP is stored) */
arch/frv/kernel/switch_to.S +2 -1
@@ -11,6 +11,7 @@ # as published by the Free Software Foun # 2 of the License, or (at your option) any later version. # ############################################################################### + #include <linux/linkage.h> #include <asm/thread_info.h> #include <asm/processor.h>
@@ -30,7 +31,7 @@ #include <asm/spr-regs.h> # address of frame 0 (userspace) on current kernel stack .globl __kernel_frame0_ptr __kernel_frame0_ptr: - .long init_thread_union + THREAD_SIZE - USER_CONTEXT_SIZE + .long init_thread_union + THREAD_SIZE - FRV_FRAME0_SIZE # address of current task .globl __kernel_current_task
arch/frv/kernel/traps.c +13 -12
@@ -20,6 +20,7 @@ #include <linux/linkage.h>#include <linux/init.h> #include <linux/module.h> +#include <asm/asm-offsets.h> #include <asm/setup.h> #include <asm/fpu.h> #include <asm/system.h>
@@ -279,20 +280,20 @@ static const char *regnames[] = {void show_regs (struct pt_regs *regs) { -uint32_t *reg; +unsigned long *reg;int loop;printk ("\n" ); -printk ("Frame: @%08x [%s]\n" , - (uint32_t ) regs, +printk ("Frame: @%08lx [%s]\n" , + (unsigned long ) regs, regs->psr &PSR_S ?"kernel" :"user" ); - reg = (uint32_t *) regs; -for (loop =0 ; loop <REG__END ; loop++) { -printk ("%s %08x" , regnames[loop +0 ], reg[loop +0 ]); + reg = (unsigned long *) regs; +for (loop =0 ; loop <NR_PT_REGS ; loop++) { +printk ("%s %08lx" , regnames[loop +0 ], reg[loop +0 ]); -if (loop ==REG__END -1 || loop %5 ==4 ) +if (loop ==NR_PT_REGS -1 || loop %5 ==4 )printk ("\n" );else printk (" | " );
@@ -328,7 +329,7 @@ void die_if_kernel(const char *str, ...)*/ static void show_backtrace_regs (struct pt_regs *frame) { -uint32_t *reg; +unsigned long *reg;int loop;/* print the registers for this frame */
@@ -336,11 +337,11 @@ static void show_backtrace_regs(struct p frame->psr &PSR_S ?"Kernel Mode" :"User Mode" , frame); - reg = (uint32_t *) frame; -for (loop =0 ; loop <REG__END ; loop++) { -printk ("%s %08x" , regnames[loop +0 ], reg[loop +0 ]); + reg = (unsigned long *) frame; +for (loop =0 ; loop <NR_PT_REGS ; loop++) { +printk ("%s %08lx" , regnames[loop +0 ], reg[loop +0 ]); -if (loop ==REG__END -1 || loop %5 ==4 ) +if (loop ==NR_PT_REGS -1 || loop %5 ==4 )printk ("\n" );else printk (" | " );
include/asm-frv/gdb-stub.h +22 -0
@@ -89,6 +89,7 @@ extern void gdbstub_do_rx(void); extern asmlinkage void __debug_stub_init_break(void); extern asmlinkage void __break_hijack_kernel_event(void); +extern asmlinkage void __break_hijack_kernel_event_breaks_here(void); extern asmlinkage void start_kernel(void); extern asmlinkage void gdbstub_rx_handler(void);
@@ -114,5 +115,26 @@ #else#define gdbstub_proto (FMT ,...) ({ 0; })#endif +/* +* we dedicate GR31 to keeping a pointer to the gdbstub exception frame +* - gr31 is destroyed on entry to the gdbstub if !MMU +* - gr31 is saved in scr3 on entry to the gdbstub if in !MMU +*/ +registerstruct frv_frame0 *__debug_frame0 asm("gr31" ); + +#define __debug_frame (&__debug_frame0->regs) +#define __debug_user_context (&__debug_frame0->uc) +#define __debug_regs (&__debug_frame0->debug) +#define __debug_reg (X ) ((unsigned long *) ((unsigned long) &__debug_frame0 + (X))) + +struct frv_debug_status { +unsigned long bpsr; +unsigned long dcr; +unsigned long brr; +unsigned long nmar; +}; + +extern struct frv_debug_status __debug_status; +#endif /* _LANGUAGE_ASSEMBLY */ #endif /* __ASM_GDB_STUB_H */
include/asm-frv/ptrace.h +2 -10
@@ -62,18 +62,10 @@ #define PTRACE_GETFDPIC_INTERP 1 /* [add#ifndef __ASSEMBLY__/* -* dedicate GR28; to keeping the a pointer to the current exception frame +* we dedicate GR28 to keeping a pointer to the current exception frame +* - gr28 is destroyed on entry to the kernel from userspace */ registerstruct pt_regs *__frame asm("gr28" ); -registerstruct pt_regs *__debug_frame asm("gr31" ); - -#ifndef container_of -#define container_of (ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) -#endif - -#define __debug_regs container_of(__debug_frame, struct pt_debug_regs, normal_regs)#define user_mode (regs) (!((regs)->psr & PSR_S))#define instruction_pointer (regs) ((regs)->pc)
include/asm-frv/registers.h +37 -60
145 lines not on this page · raw message
include/asm-frv/thread_info.h +4 -20
@@ -19,6 +19,8 @@ #ifndef __ASSEMBLY__#include <asm/processor.h> #endif +#define THREAD_SIZE 8192 +/* * low level task data that entry.S needs immediate access to * - this struct should fit entirely inside of one cache line
@@ -46,15 +48,7 @@ struct thread_info {#else /* !__ASSEMBLY__ */ -/* offsets into the thread_info struct for assembly code access */ -#define TI_TASK 0x00000000 -#define TI_EXEC_DOMAIN 0x00000004 -#define TI_FLAGS 0x00000008 -#define TI_STATUS 0x0000000C -#define TI_CPU 0x00000010 -#define TI_PRE_COUNT 0x00000014 -#define TI_ADDR_LIMIT 0x00000018 -#define TI_RESTART_BLOCK 0x0000001C +#include <asm/asm-offsets.h> #endif
@@ -83,12 +77,6 @@ #define INIT_THREAD_INFO(tsk) \#define init_thread_info (init_thread_union.thread_info)#define init_stack (init_thread_union.stack) -#ifdef CONFIG_SMALL_TASKS -#define THREAD_SIZE 4096 -#else -#define THREAD_SIZE 8192 -#endif -/* how to get the thread information struct from C */ registerstruct thread_info *__current_thread_info asm("gr15" );
@@ -111,11 +99,7 @@ #endif#define free_thread_info (info) kfree(info) -#else /* !__ASSEMBLY__ */ - -#define THREAD_SIZE 8192 - -#endif +#endif /* __ASSEMBLY__ */ /* * thread information flags