claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More newline and whitespace cleanups

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-02-20 02:26:27 -05:00
parent a66e392b26
commit 4674756664
401 changed files with 6985 additions and 6985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mem/intel_flash.c
View File

@@ -138,7 +138,7 @@ flash_readw(uint32_t addr, void *p)
case CMD_IID:
if (addr & 2)
ret = dev->flash_id;
else
else
ret = 0x0089;
break;
@@ -314,7 +314,7 @@ intel_flash_add_mappings(flash_t *dev)
else
base = 0xe0000 + (i << 16);
fbase = base & biosmask;
fbase = base & biosmask;
if (dev->flags & FLAG_INV_A16)
fbase ^= 0x10000;
@@ -508,7 +508,7 @@ intel_flash_init(const device_t *info)
dev->block_start[BLOCK_BOOT] = 0x1e000; /* BOOT BLOCK */
dev->block_end[BLOCK_BOOT] = 0x1ffff;
}
break;
break;
}
intel_flash_add_mappings(dev);

28
src/mem/mem.c
View File

@@ -427,7 +427,7 @@ uint64_t
mmutranslatereal(uint32_t addr, int rw)
{
/* Fast path to return invalid without any call if an exception has occurred beforehand. */
if (cpu_state.abrt)
if (cpu_state.abrt)
return 0xffffffffffffffffULL;
if (cr4 & CR4_PAE)
@@ -442,7 +442,7 @@ uint32_t
mmutranslatereal32(uint32_t addr, int rw)
{
/* Fast path to return invalid without any call if an exception has occurred beforehand. */
if (cpu_state.abrt)
if (cpu_state.abrt)
return (uint32_t) 0xffffffffffffffffULL;
return (uint32_t) mmutranslatereal(addr, rw);
@@ -455,7 +455,7 @@ mmutranslate_noabrt_normal(uint32_t addr, int rw)
uint32_t temp,temp2,temp3;
uint32_t addr2;
if (cpu_state.abrt)
if (cpu_state.abrt)
return 0xffffffffffffffffULL;
addr2 = ((cr3 & ~0xfff) + ((addr >> 20) & 0xffc));
@@ -488,7 +488,7 @@ mmutranslate_noabrt_pae(uint32_t addr, int rw)
uint64_t temp,temp2,temp3,temp4;
uint64_t addr2,addr3,addr4;
if (cpu_state.abrt)
if (cpu_state.abrt)
return 0xffffffffffffffffULL;
addr2 = (cr3 & ~0x1f) + ((addr >> 27) & 0x18);
@@ -527,7 +527,7 @@ uint64_t
mmutranslate_noabrt(uint32_t addr, int rw)
{
/* Fast path to return invalid without any call if an exception has occurred beforehand. */
if (cpu_state.abrt)
if (cpu_state.abrt)
return 0xffffffffffffffffULL;
if (cr4 & CR4_PAE)
@@ -675,7 +675,7 @@ getpccache(uint32_t a)
else
cpu_prefetch_cycles = cpu_mem_prefetch_cycles;
}
return &_mem_exec[a64 >> MEM_GRANULARITY_BITS][(uintptr_t)(a64 & MEM_GRANULARITY_PAGE) - (uintptr_t)(a2 & ~0xfff)];
}
@@ -2076,7 +2076,7 @@ mem_write_ram(uint32_t addr, uint8_t val, void *priv)
if ((addr >= 0xa0000) && (addr <= 0xbffff))
mem_log("Write B %02X to %08X\n", val, addr);
#endif
if (is286) {
if (is286) {
addwritelookup(mem_logical_addr, addr);
mem_write_ramb_page(addr, val, &pages[addr >> 12]);
} else
@@ -2192,7 +2192,7 @@ mem_invalidate_range(uint32_t start_addr, uint32_t end_addr)
page_t *p;
start_addr &= ~PAGE_MASK_MASK;
end_addr = (end_addr + PAGE_MASK_MASK) & ~PAGE_MASK_MASK;
end_addr = (end_addr + PAGE_MASK_MASK) & ~PAGE_MASK_MASK;
for (; start_addr <= end_addr; start_addr += 0x1000) {
if ((start_addr >> 12) >= pages_sz)
@@ -2212,7 +2212,7 @@ mem_invalidate_range(uint32_t start_addr, uint32_t end_addr)
#else
uint32_t cur_addr;
start_addr &= ~PAGE_MASK_MASK;
end_addr = (end_addr + PAGE_MASK_MASK) & ~PAGE_MASK_MASK;
end_addr = (end_addr + PAGE_MASK_MASK) & ~PAGE_MASK_MASK;
for (; start_addr <= end_addr; start_addr += 0x1000) {
/* Do nothing if the pages array is empty or DMA reads/writes to/from PCI device memory addresses
@@ -2323,8 +2323,8 @@ mem_mapping_recalc(uint64_t base, uint64_t size)
void
mem_mapping_set(mem_mapping_t *map,
uint32_t base,
uint32_t size,
uint32_t base,
uint32_t size,
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),
@@ -2361,8 +2361,8 @@ mem_mapping_set(mem_mapping_t *map,
void
mem_mapping_add(mem_mapping_t *map,
uint32_t base,
uint32_t size,
uint32_t base,
uint32_t size,
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),
@@ -2811,7 +2811,7 @@ mem_remap_top(int kb)
set = 0;
} else
old_kb = kb;
if (size > kb)
size = kb;

8
src/mem/rom.c
View File

@@ -71,7 +71,7 @@ rom_fopen(char *fn, char *mode)
if (rom_path[0] != '\0') {
memset(fn2, 0x00, strlen(fn) + 1);
memcpy(fn2, &(fn[5]), strlen(fn) - 4);
memcpy(fn2, &(fn[5]), strlen(fn) - 4);
plat_append_filename(temp, rom_path, fn2);
} else {
@@ -185,7 +185,7 @@ rom_load_linear_oddeven(char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
{
FILE *f = rom_fopen(fn, "rb");
int i;
if (f == NULL) {
rom_log("ROM: image '%s' not found\n", fn);
return(0);
@@ -221,7 +221,7 @@ int
rom_load_linear(char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
{
FILE *f = rom_fopen(fn, "rb");
if (f == NULL) {
rom_log("ROM: image '%s' not found\n", fn);
return(0);
@@ -251,7 +251,7 @@ int
rom_load_linear_inverted(char *fn, uint32_t addr, int sz, int off, uint8_t *ptr)
{
FILE *f = rom_fopen(fn, "rb");
if (f == NULL) {
rom_log("ROM: image '%s' not found\n", fn);
return(0);

2
src/mem/smram.c
View File

@@ -259,7 +259,7 @@ smram_add(void)
if (temp_smram == NULL) {
fatal("smram_add(): temp_smram malloc failed\n");
return NULL;
}
}
memset(temp_smram, 0x00, sizeof(smram_t));
memset(&(temp_smram->mapping), 0x00, sizeof(mem_mapping_t));

2
src/mem/spd.c
View File

@@ -213,7 +213,7 @@ spd_register(uint8_t ram_type, uint8_t slot_mask, uint16_t max_module_size)
rows[slot] = 0;
if (slot_mask & (1 << slot))
slot_count++;
}
}
/* Populate rows. */
spd_populate(rows, slot_count, (mem_size >> 10), min_module_size, max_module_size, 1);

6
src/mem/sst_flash.c
View File

@@ -44,7 +44,7 @@ typedef struct sst_t
uint32_t size, mask,
page_mask, page_base,
last_addr;
uint8_t page_buffer[128],
page_dirty[128];
uint8_t *array;
@@ -304,7 +304,7 @@ sst_write(uint32_t addr, uint8_t val, void *p)
} else {
dev->command_state++;
sst_buf_write(dev, addr, val);
}
}
break;
case 7:
if (!dev->is_39)
@@ -390,7 +390,7 @@ sst_add_mappings(sst_t *dev)
for (i = 0; i < count; i++) {
base = root_base + (i << 16);
fbase = base & biosmask;
fbase = base & biosmask;
memcpy(&dev->array[fbase], &rom[base & biosmask], 0x10000);