Merge branch 'master' of github.com:86Box/86Box into tc1995

src/codegen/codegen_accumulate_x86-64.c

@@ -26,7 +26,7 @@ void codegen_accumulate(int acc_reg, int delta)
 		addbyte(0x04);
 		addbyte(0x25);
 		addlong((uint32_t) (uintptr_t) &(acycs));
-		addlong(delta);
+		addlong(-delta);
 	}
 }
 

src/codegen/codegen_accumulate_x86.c

@@ -25,7 +25,7 @@ void codegen_accumulate(int acc_reg, int delta)
 		addbyte(0x81); /*ADD $acc_regs[c].count,acc_regs[c].dest*/
 		addbyte(0x05);
 		addlong((uint32_t) (uintptr_t) &(acycs));
-		addlong((uintptr_t) delta);
+		addlong((uintptr_t) -delta);
 	}
 }
 

src/codegen_new/codegen_accumulate.c

@@ -22,7 +22,7 @@ void codegen_accumulate(ir_data_t *ir, int acc_reg, int delta)
         acc_regs[acc_reg].count += delta;
 
 	if (delta != 0) {
-		uop_ADD_IMM(ir, IREG_acycs, IREG_acycs, delta);
+		uop_ADD_IMM(ir, IREG_acycs, IREG_acycs, -delta);
 	}
 }
 

src/cpu/386_dynarec.c

@@ -296,7 +296,8 @@ void update_tsc(void)
 		tsc += cycdiff;
     } else {
 	/* TSC has not changed. */
-	tsc += cycdiff;
+	if (cycdiff > 0)
+		tsc += cycdiff;
     }
 
     if (cycdiff > 0) {

src/include/86box/network.h

@@ -141,7 +141,7 @@ extern const device_t	*network_card_getdevice(int);
 extern void	network_set_wait(int wait);
 extern int	network_get_wait(void);
 
-extern int	network_timer_stop(void);
+extern void	network_timer_stop(void);
 
 extern void	network_queue_put(int tx, void *priv, uint8_t *data, int len);
 

src/pc.c

@@ -681,7 +681,7 @@ pc_reset_hard_close(void)
 {
     ui_sb_set_ready(0);
 
-    network_timer_close();
+    network_timer_stop();
 
     /* Turn off timer processing to avoid potential segmentation faults. */
     timer_close();