[xtensa-cvscommit] linux/include/asm-xtensa ipcbuf.h,1.2,1.3 pgtable.h,1.11,1.12 timex.h,1.2,1.3 uac
Brought to you by:
zankel
Menu
▾
▴
[xtensa-cvscommit] linux/include/asm-xtensa ipcbuf.h,1.2,1.3 pgtable.h,1.11,1.12 timex.h,1.2,1.3 uaccess.h,1.4,1.5 user.h,1.2,1.3
|
From: <joe...@us...> - 2003-07-25 00:22:32
|
Update of /cvsroot/xtensa/linux/include/asm-xtensa
In directory sc8-pr-cvs1:/tmp/cvs-serv3298/include/asm-xtensa
Modified Files:
ipcbuf.h pgtable.h timex.h uaccess.h user.h
Log Message:
ipcbuf.h: Change ipcbuf structure to match glibc's.
pgtable.h: Ensure PTEs are set to user pages.
timex.h: Remove unneeded CLOCK_TICK_RATE for ISS platform.
uaccess.h: Define assembler-version task size.
user.h: Replace contents with something obvious that indicates it's entirely unused.
Index: ipcbuf.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/ipcbuf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ipcbuf.h 15 Feb 2003 02:02:40 -0000 1.2
--- ipcbuf.h 25 Jul 2003 00:22:29 -0000 1.3
***************
*** 9,15 ****
* between kernel and user space.
*
! * Pad space is left for:
! * - 32-bit mode_t and seq
! * - 2 miscellaneous 32-bit values
*
* This file is subject to the terms and conditions of the GNU General
--- 9,13 ----
* between kernel and user space.
*
! * Pad space is left for 2 miscellaneous 32-bit values.
*
* This file is subject to the terms and conditions of the GNU General
***************
*** 27,35 ****
__kernel_gid32_t cgid;
__kernel_mode_t mode;
! unsigned short __pad1;
! unsigned short seq;
! unsigned short __pad2;
! unsigned long __unused1;
! unsigned long __unused2;
};
--- 25,31 ----
__kernel_gid32_t cgid;
__kernel_mode_t mode;
! unsigned long int seq;
! unsigned long int __unused1;
! unsigned long int __unused2;
};
Index: pgtable.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/pgtable.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pgtable.h 1 Apr 2003 22:26:53 -0000 1.11
--- pgtable.h 25 Jul 2003 00:22:29 -0000 1.12
***************
*** 699,704 ****
#define SWP_OFFSET(x) ((x).val >> 13)
#define SWP_ENTRY(type,offset) ((swp_entry_t) { ((type) << 7) | ((offset) << 13) })
! #define pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
! #define swp_entry_to_pte(x) ((pte_t) { (x).val })
--- 699,704 ----
#define SWP_OFFSET(x) ((x).val >> 13)
#define SWP_ENTRY(type,offset) ((swp_entry_t) { ((type) << 7) | ((offset) << 13) })
! #define pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) & ~_PAGE_RING_MASK })
! #define swp_entry_to_pte(x) __pte( (x).val | _PAGE_USER )
Index: timex.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/timex.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** timex.h 8 Jan 2003 23:30:31 -0000 1.2
--- timex.h 25 Jul 2003 00:22:29 -0000 1.3
***************
*** 27,41 ****
#define LINUX_TIMER_MASK (1L << LINUX_TIMER_INT)
- /* Striving for a 60 Hz system clock, assume 1 MHz during iss and 10
- MHz on the simulation hardware (XT2000?) */
-
- #ifdef XTENSA_ISS
- #define CLOCK_TICK_RATE 1000000
- #else
extern unsigned clock_tick_rate;
#define CLOCK_TICK_RATE clock_tick_rate
- #endif
! #define LINUX_TIMER_INTERVAL ( CLOCK_TICK_RATE/HZ )
typedef unsigned long long cycles_t;
--- 27,34 ----
#define LINUX_TIMER_MASK (1L << LINUX_TIMER_INT)
extern unsigned clock_tick_rate;
#define CLOCK_TICK_RATE clock_tick_rate
! #define LINUX_TIMER_INTERVAL ( CLOCK_TICK_RATE / HZ )
typedef unsigned long long cycles_t;
Index: uaccess.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/uaccess.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** uaccess.h 7 Jul 2003 22:41:59 -0000 1.4
--- uaccess.h 25 Jul 2003 00:22:29 -0000 1.5
***************
*** 112,116 ****
*/
.macro user_ok aa, as, at, error
! movi \at, (TASK_SIZE+1)
bgeu \as, \at, \error
sub \at, \at, \as
--- 112,116 ----
*/
.macro user_ok aa, as, at, error
! movi \at, (TASK_SIZE_ASM+1)
bgeu \as, \at, \error
sub \at, \at, \as
Index: user.h
===================================================================
RCS file: /cvsroot/xtensa/linux/include/asm-xtensa/user.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user.h 7 Feb 2003 02:03:34 -0000 1.2
--- user.h 25 Jul 2003 00:22:29 -0000 1.3
***************
*** 5,72 ****
* include/asm-xtensa/user.h
*
- * Xtensa Processor version.
- *
* 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.
*
- * Derived from SH.
- *
* Copyright (C) 2001 - 2003 Tensilica Inc.
*/
- #include <linux/types.h>
- #include <asm/ptrace.h>
- #include <asm/page.h>
- #include <asm/elf.h>
! #if 0 /* not used for Xtensa? */
! /*
! * 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). The 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 handy at some point. All of the registers
! * are stored as part of the upage. The upage should always be
! * only one page long.
! * data: The data segment follows next. We use current->end_text to
! * current->brk to pick up all of the user variables, plus any memory
! * that may have been sbrk'ed. 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 usp to
! * current->start_stack, so we round each of these in order to be able
! * to write an integer number of pages.
! */
struct user {
! struct pt_regs regs; /* entire machine state */
! elf_fpregset_t cpregs; /* coprocessor & extra registers */
! unsigned u_cpevalid; /* non-zero if any coprocessor(s) or extra state used */
! size_t u_tsize; /* text size (pages) */
! size_t u_dsize; /* data size (pages) */
! size_t u_ssize; /* stack size (pages) */
! unsigned long start_code; /* text starting address */
! unsigned long start_data; /* data starting address */
! unsigned long start_stack; /* stack starting address */
! long int signal; /* signal causing core dump */
! struct regs * u_ar0; /* help gdb find registers */
! unsigned long magic; /* identifies a core file */
! char u_comm[32]; /* user command name */
};
-
- #define NBPG PAGE_SIZE
- #define UPAGES 1
- #define HOST_TEXT_START_ADDR (u.start_code)
- #define HOST_DATA_START_ADDR (u.start_data)
- #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
-
- #endif /*0*/
-
#endif /* __ASM_XTENSA_USER_H */
--- 5,24 ----
* include/asm-xtensa/user.h
*
* 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.
*
* Copyright (C) 2001 - 2003 Tensilica Inc.
*/
! /* 'struct user' is only for a.out file formats. Xtensa doesn't
! * support the a.out format. We provide a dummy definition to resolve
! * compiler warnings in a generic kernel file. */
struct user {
! int __dont_use_this_struct;
! int __aout_not_supported_on_xtensa;
};
#endif /* __ASM_XTENSA_USER_H */
|
