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

Timer clean-up improvements and some mem.c sanity checks.

Browse Source
This commit is contained in:
OBattler
2020-05-20 20:35:55 +02:00
parent 319d55f0ea
commit fc28978370
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mem.c
View File

@@ -1678,9 +1678,9 @@ void
mem_write_ramb_page(uint32_t addr, uint8_t val, page_t *p) mem_write_ramb_page(uint32_t addr, uint8_t val, page_t *p)
{ {
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
if (val != p->mem[addr & 0xfff] || codegen_in_recompile) { if ((p == NULL) || (p->mem == NULL) || (val != p->mem[addr & 0xfff]) || codegen_in_recompile) {
#else #else
if (val != p->mem[addr & 0xfff]) { if ((p == NULL) || (p->mem == NULL) || (val != p->mem[addr & 0xfff])) {
#endif #endif
uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK); uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK);
p->dirty_mask[(addr >> PAGE_MASK_INDEX_SHIFT) & PAGE_MASK_INDEX_MASK] |= mask; p->dirty_mask[(addr >> PAGE_MASK_INDEX_SHIFT) & PAGE_MASK_INDEX_MASK] |= mask;
@@ -1693,9 +1693,9 @@ void
mem_write_ramw_page(uint32_t addr, uint16_t val, page_t *p) mem_write_ramw_page(uint32_t addr, uint16_t val, page_t *p)
{ {
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
if (val != *(uint16_t *)&p->mem[addr & 0xfff] || codegen_in_recompile) { if ((p == NULL) || (p->mem == NULL) || (val != *(uint16_t *)&p->mem[addr & 0xfff]) || codegen_in_recompile) {
#else #else
if (val != *(uint16_t *)&p->mem[addr & 0xfff]) { if ((p == NULL) || (p->mem == NULL) || (val != *(uint16_t *)&p->mem[addr & 0xfff])) {
#endif #endif
uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK); uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK);
if ((addr & 0xf) == 0xf) if ((addr & 0xf) == 0xf)
@@ -1710,9 +1710,9 @@ void
mem_write_raml_page(uint32_t addr, uint32_t val, page_t *p) mem_write_raml_page(uint32_t addr, uint32_t val, page_t *p)
{ {
#ifdef USE_DYNAREC #ifdef USE_DYNAREC
if (val != *(uint32_t *)&p->mem[addr & 0xfff] || codegen_in_recompile) { if ((p == NULL) || (p->mem == NULL) || (val != *(uint32_t *)&p->mem[addr & 0xfff]) || codegen_in_recompile) {
#else #else
if (val != *(uint32_t *)&p->mem[addr & 0xfff]) { if ((p == NULL) || (p->mem == NULL) || (val != *(uint32_t *)&p->mem[addr & 0xfff])) {
#endif #endif
uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK); uint64_t mask = (uint64_t)1 << ((addr >> PAGE_MASK_SHIFT) & PAGE_MASK_MASK);
if ((addr & 0xf) >= 0xd) if ((addr & 0xf) >= 0xd)

1
src/network/network.c
View File

@@ -350,6 +350,7 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx, NETWAITCB wait, NETSETLINKST
first_pkt[0] = first_pkt[1] = NULL; first_pkt[0] = first_pkt[1] = NULL;
last_pkt[0] = last_pkt[1] = NULL; last_pkt[0] = last_pkt[1] = NULL;
memset(&network_rx_queue_timer, 0x00, sizeof(pc_timer_t));
timer_add(&network_rx_queue_timer, network_rx_queue, NULL, 0); timer_add(&network_rx_queue_timer, network_rx_queue, NULL, 0);
/* 10 mbps. */ /* 10 mbps. */
timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0); timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0);

15
src/timer.c
View File

@@ -110,8 +110,10 @@ timer_remove_head(void)
if (timer_head) { if (timer_head) {
timer = timer_head; timer = timer_head;
timer_head = timer->next; timer_head = timer->next;
if (timer_head) if (timer_head) {
timer_head->prev = NULL; timer_head->prev = NULL;
timer->next->prev = NULL;
}
timer->next = timer->prev = NULL; timer->next = timer->prev = NULL;
timer->flags &= ~TIMER_ENABLED; timer->flags &= ~TIMER_ENABLED;
} }
@@ -151,6 +153,17 @@ timer_process(void)
void void
timer_close(void) timer_close(void)
{ {
pc_timer_t *t = timer_head, *r;
/* Set all timers' prev and next to NULL so it is assured that
timers that are not in malloc'd structs don't keep pointing
to timers that may be in malloc'd structs. */
while (t != NULL) {
r = t;
r->prev = r->next = NULL;
t = r->next;
}
timer_head = NULL; timer_head = NULL;
timer_inited = 0; timer_inited = 0;