debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/mca_asm.h @ 4619:5b9e241131fb

bitkeeper revision 1.1329 (42661815u5WPq8d5f4_axi2xWheybA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 20 08:51:33 2005 +0000 (2005-04-20)
parents 58efb3448933
children 0fadb891522c 541012edd6e5 6cbe0dc99129 c91f74efda05
line source
1 mca_asm.h | 11 +++++++++++
2 1 files changed, 11 insertions(+)
4 Index: linux-2.6.11-xendiffs/include/asm-ia64/mca_asm.h
5 ===================================================================
6 --- linux-2.6.11-xendiffs.orig/include/asm-ia64/mca_asm.h 2005-03-02 01:38:38.000000000 -0600
7 +++ linux-2.6.11-xendiffs/include/asm-ia64/mca_asm.h 2005-04-06 22:41:57.392411032 -0500
8 @@ -26,8 +26,13 @@
9 * direct mapped to physical addresses.
10 * 1. Lop off bits 61 thru 63 in the virtual address
11 */
12 +#ifdef XEN
13 +#define INST_VA_TO_PA(addr) \
14 + dep addr = 0, addr, 60, 4
15 +#else // XEN
16 #define INST_VA_TO_PA(addr) \
17 dep addr = 0, addr, 61, 3
18 +#endif // XEN
19 /*
20 * This macro converts a data virtual address to a physical address
21 * Right now for simulation purposes the virtual addresses are
22 @@ -42,9 +47,15 @@
23 * direct mapped to physical addresses.
24 * 1. Put 0x7 in bits 61 thru 63.
25 */
26 +#ifdef XEN
27 +#define DATA_PA_TO_VA(addr,temp) \
28 + mov temp = 0xf ;; \
29 + dep addr = temp, addr, 60, 4
30 +#else // XEN
31 #define DATA_PA_TO_VA(addr,temp) \
32 mov temp = 0x7 ;; \
33 dep addr = temp, addr, 61, 3
34 +#endif // XEN
36 #define GET_THIS_PADDR(reg, var) \
37 mov reg = IA64_KR(PER_CPU_DATA);; \