claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Full Upgrade to the 1.7 tree.

Browse Source
This commit is contained in:
waltje
2018-10-06 18:20:09 -04:00
parent b775d592d4
commit 2f69c95152
395 changed files with 57724 additions and 52823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mem.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the memory interface.
*
* Version: @(#)mem.h 1.0.9 2018/08/20
* Version: @(#)mem.h 1.0.10 2018/09/18
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Sarah Walker, <tommowalker@tommowalker.co.uk>
@@ -58,8 +58,8 @@
#define MEM_WRITE_MASK 0x0f
typedef struct _mem_mapping_ {
struct _mem_mapping_ *prev, *next;
typedef struct _memmap_ {
struct _memmap_ *prev, *next;
int enable;
@@ -80,7 +80,7 @@ typedef struct _mem_mapping_ {
void *p; /* backpointer to mapping or device */
void *dev; /* backpointer to memory device */
} mem_mapping_t;
} mem_map_t;
typedef struct _page_ {
void (*write_b)(uint32_t addr, uint8_t val, struct _page_ *p);
@@ -103,7 +103,6 @@ extern uint8_t *ram;
extern uint32_t rammask;
extern uint8_t *rom;
extern uint8_t romext[32768];
extern uint32_t biosmask;
extern int readlookup[256],
@@ -116,11 +115,9 @@ extern uintptr_t *writelookup2;
extern int writelnext;
extern uint32_t ram_mapped_addr[64];
mem_mapping_t base_mapping,
extern mem_map_t base_mapping,
ram_low_mapping,
#if 1
ram_mid_mapping,
#endif
ram_remapped_mapping,
ram_high_mapping,
bios_mapping[8],
@@ -136,8 +133,6 @@ extern uint32_t get_phys_virt,get_phys_phys;
extern int shadowbios,
shadowbios_write;
extern int readlnum,
writelnum;
extern int nopageerrors;
extern int memspeed[11];
@@ -180,9 +175,9 @@ extern void addreadlookup(uint32_t virt, uint32_t phys);
extern void addwritelookup(uint32_t virt, uint32_t phys);
extern void mem_mapping_del(mem_mapping_t *);
extern void mem_map_del(mem_map_t *);
extern void mem_mapping_add(mem_mapping_t *,
extern void mem_map_add(mem_map_t *,
uint32_t base,
uint32_t size,
uint8_t (*read_b)(uint32_t addr, void *p),
@@ -195,7 +190,7 @@ extern void mem_mapping_add(mem_mapping_t *,
uint32_t flags,
void *p);
extern void mem_mapping_set_handler(mem_mapping_t *,
extern void mem_map_set_handler(mem_map_t *,
uint8_t (*read_b)(uint32_t addr, void *p),
uint16_t (*read_w)(uint32_t addr, void *p),
uint32_t (*read_l)(uint32_t addr, void *p),
@@ -203,15 +198,14 @@ extern void mem_mapping_set_handler(mem_mapping_t *,
void (*write_w)(uint32_t addr, uint16_t val, void *p),
void (*write_l)(uint32_t addr, uint32_t val, void *p));
extern void mem_mapping_set_p(mem_mapping_t *, void *p);
extern void mem_map_set_p(mem_map_t *, void *p);
extern void mem_mapping_set_dev(mem_mapping_t *, void *dev);
extern void mem_map_set_dev(mem_map_t *, void *dev);
extern void mem_mapping_set_addr(mem_mapping_t *,
uint32_t base, uint32_t size);
extern void mem_mapping_set_exec(mem_mapping_t *, uint8_t *exec);
extern void mem_mapping_disable(mem_mapping_t *);
extern void mem_mapping_enable(mem_mapping_t *);
extern void mem_map_set_addr(mem_map_t *, uint32_t base, uint32_t size);
extern void mem_map_set_exec(mem_map_t *, uint8_t *exec);
extern void mem_map_disable(mem_map_t *);
extern void mem_map_enable(mem_map_t *);
extern void mem_set_mem_state(uint32_t base, uint32_t size, int state);
@@ -256,6 +250,7 @@ extern void mmu_invalidate(uint32_t addr);
extern void mem_a20_recalc(void);
extern void mem_add_bios(void);
extern void mem_add_upper_bios(void);
extern void mem_init(void);
extern void mem_reset(void);