Revision 9b3c35e0

b/cpu-all.h
799 799
/* Return the physical page corresponding to a virtual one. Use it
800 800
   only for debugging because no protection checks are done. Return -1
801 801
   if no page found. */
802
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr);
802
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr);
803 803

  
804 804
#define CPU_LOG_TB_OUT_ASM (1 << 0) 
805 805
#define CPU_LOG_TB_IN_ASM  (1 << 1)
b/exec.c
1030 1030
#if defined(TARGET_HAS_ICE)
1031 1031
static void breakpoint_invalidate(CPUState *env, target_ulong pc)
1032 1032
{
1033
    target_ulong addr, pd;
1033
    target_phys_addr_t addr;
1034
    target_ulong pd;
1034 1035
    ram_addr_t ram_addr;
1035 1036
    PhysPageDesc *p;
1036 1037

  
......
2574 2575
                        uint8_t *buf, int len, int is_write)
2575 2576
{
2576 2577
    int l;
2577
    target_ulong page, phys_addr;
2578
    target_phys_addr_t phys_addr;
2579
    target_ulong page;
2578 2580

  
2579 2581
    while (len > 0) {
2580 2582
        page = addr & TARGET_PAGE_MASK;
b/target-alpha/helper.c
39 39
    return 1;
40 40
}
41 41

  
42
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
42
target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
43 43
{
44 44
    return addr;
45 45
}
......
51 51

  
52 52
#else
53 53

  
54
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
54
target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
55 55
{
56 56
    return -1;
57 57
}
b/target-arm/helper.c
126 126
    return 1;
127 127
}
128 128

  
129
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
129
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
130 130
{
131 131
    return addr;
132 132
}
......
441 441
    return 1;
442 442
}
443 443

  
444
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
444
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
445 445
{
446 446
    uint32_t phys_addr;
447 447
    int prot;
b/target-i386/helper2.c
578 578
    return 1;
579 579
}
580 580

  
581
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
581
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
582 582
{
583 583
    return addr;
584 584
}
......
876 876
    return 1;
877 877
}
878 878

  
879
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
879
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
880 880
{
881 881
    uint32_t pde_addr, pte_addr;
882 882
    uint32_t pde, pte, paddr, page_offset, page_size;
b/target-m68k/translate.c
2738 2738
}
2739 2739

  
2740 2740
/* ??? */
2741
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
2741
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
2742 2742
{
2743 2743
    return addr;
2744 2744
}
b/target-mips/helper.c
141 141
}
142 142

  
143 143
#if defined(CONFIG_USER_ONLY) 
144
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
144
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
145 145
{
146 146
    return addr;
147 147
}
148 148
#else
149
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
149
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
150 150
{
151 151
    target_ulong phys_addr;
152 152
    int prot;
b/target-ppc/helper.c
60 60
    return 1;
61 61
}
62 62

  
63
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
63
target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
64 64
{
65 65
    return addr;
66 66
}
......
821 821
    return ret;
822 822
}
823 823

  
824
target_ulong cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
824
target_phys_addr_t cpu_get_phys_page_debug (CPUState *env, target_ulong addr)
825 825
{
826 826
    mmu_ctx_t ctx;
827 827

  
b/target-sh4/helper.c
53 53
    return 1;
54 54
}
55 55

  
56
target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
56
target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
57 57
{
58 58
    return addr;
59 59
}
......
429 429
    return tlb_set_page(env, address, physical, prot, is_user, is_softmmu);
430 430
}
431 431

  
432
target_ulong cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
432
target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
433 433
{
434 434
    target_ulong physical;
435 435
    int prot;
b/target-sparc/translate.c
3012 3012
}
3013 3013

  
3014 3014
#if defined(CONFIG_USER_ONLY)
3015
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3015
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3016 3016
{
3017 3017
    return addr;
3018 3018
}
......
3022 3022
                                 int *access_index, target_ulong address, int rw,
3023 3023
                                 int is_user);
3024 3024

  
3025
target_ulong cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3025
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
3026 3026
{
3027 3027
    target_phys_addr_t phys_addr;
3028 3028
    int prot, access_index;

Also available in: Unified diff