Revision 03875444 cpu-all.h

b/cpu-all.h
700 700

  
701 701
/* page related stuff */
702 702

  
703
#define TARGET_PAGE_SIZE (1UL << TARGET_PAGE_BITS)
703
#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
704 704
#define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1)
705 705
#define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK)
706 706

  
......
806 806
int cpu_inl(CPUState *env, int addr);
807 807
#endif
808 808

  
809
/* address in the RAM (different from a physical address) */
810
typedef unsigned long ram_addr_t;
811

  
812 809
/* memory API */
813 810

  
814
extern ram_addr_t phys_ram_size;
811
extern int phys_ram_size;
815 812
extern int phys_ram_fd;
816 813
extern uint8_t *phys_ram_base;
817 814
extern uint8_t *phys_ram_dirty;
818
extern ram_addr_t ram_size;
819 815

  
820 816
/* physical memory access */
821 817
#define TLB_INVALID_MASK   (1 << 3)
......
837 833
typedef uint32_t CPUReadMemoryFunc(void *opaque, target_phys_addr_t addr);
838 834

  
839 835
void cpu_register_physical_memory(target_phys_addr_t start_addr,
840
                                  ram_addr_t size,
841
                                  ram_addr_t phys_offset);
842
ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr);
843
ram_addr_t qemu_ram_alloc(ram_addr_t);
836
                                  unsigned long size,
837
                                  unsigned long phys_offset);
838
uint32_t cpu_get_physical_page_desc(target_phys_addr_t addr);
839
ram_addr_t qemu_ram_alloc(unsigned int size);
844 840
void qemu_ram_free(ram_addr_t addr);
845 841
int cpu_register_io_memory(int io_index,
846 842
                           CPUReadMemoryFunc **mem_read,

Also available in: Unified diff