Attachment #197662 for bug #231845

View | Details | Raw Unified | Return to bug 231845
Collapse All | Expand All





PORTNAME=	dosbox
PORTVERSION=	0.74
PORTREVISION=	12
CATEGORIES=	emulators
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTNAME=	${PORTNAME}-${PORTVERSION}-2

MAINTAINER=	knyght@gmail.com
COMMENT=	Emulator of a PC with DOS


DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
		"${PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \
		"System;Emulator;" true

OPTIONS_DEFINE=	DOCS
OPTIONS_RADIO=	DEBUGGER

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (dosbox-0.74.tar.gz) = 13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05	1	TIMESTAMP = 1538386904
2	SIZE (dosbox-0.74.tar.gz) = 1265711	2	SHA256 (dosbox-0.74-2.tar.gz) = 7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf
		3	SIZE (dosbox-0.74-2.tar.gz) = 1324059

Lines 1-11 Link Here

(-)files/patch-include-dos_inc.h (-11 lines)
1	--- include/dos_inc.h.orig 2010-05-10 13:43:54.000000000 -0400
2	+++ include/dos_inc.h 2011-10-18 12:05:51.186449095 -0400
3	@@ -28,6 +28,8 @@
4	#include "mem.h"
5	#endif
6
7	+#include <stddef.h>
8	+
9	#ifdef _MSC_VER
10	#pragma pack (1)
11	#endif

Lines 1-11 Link Here

(-)files/patch-include-setup.h (-11 lines)
1	--- include/setup.h.orig 2011-10-18 12:06:07.227092555 -0400
2	+++ include/setup.h 2011-10-18 12:06:26.200853712 -0400
3	@@ -21,6 +21,8 @@
4	#ifndef DOSBOX_SETUP_H
5	#define DOSBOX_SETUP_H
6
7	+#include <stdio.h>
8	+
9	#ifdef _MSC_VER
10	#pragma warning ( disable : 4786 )
11	#pragma warning ( disable : 4290 )

Line 0 Link Here

(-)files/patch-include_setup.h (+11 lines)
	1	--- include/setup.h.orig 2018-10-01 08:56:22 UTC
	2	+++ include/setup.h
	3	@@ -21,6 +21,8 @@
	4	#ifndef DOSBOX_SETUP_H
	5	#define DOSBOX_SETUP_H
	6
	7	+#include <stdio.h>
	8	+
	9	#ifdef _MSC_VER
	10	#pragma warning ( disable : 4786 )
	11	#pragma warning ( disable : 4290 )




Index: src/cpu/core_dynrec/risc_x64.h
===================================================================
--- src/cpu/core_dynrec/risc_x64.h	(revision 3775)
+++ src/cpu/core_dynrec/risc_x64.h	(working copy)
@@ -85,7 +85,8 @@
 
 static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
 	Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
-	if ((diff<0x80000000LL) && (diff>-0x80000000LL)) {
+	if ((Bit64u)diff<0x0000000080000000ULL ||
+	    (Bit64u)diff>0xffffffff80000000ULL) {
 		cache_addb(0x05+(reg<<3));
 		// RIP-relative addressing is offset after the instruction 
 		cache_addd((Bit32u)(((Bit64u)diff)&0xffffffffLL));




Index: src/fpu/fpu_instructions_x86.h
@@ -1162,12 +1162,12 @@
 
 static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
-	FPUD_LOAD(fild,WORD,)
+	FPUD_LOAD(fild,WORD,s)
 }
 
 static void FPU_FLD_I16_EA(PhysPt addr) {
 	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
-	FPUD_LOAD_EA(fild,WORD,)
+	FPUD_LOAD_EA(fild,WORD,s)
 }
 
 static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
@@ -1212,7 +1212,7 @@
 }
 
 static void FPU_FST_I16(PhysPt addr) {
-	FPUD_STORE(fistp,WORD,)
+	FPUD_STORE(fistp,WORD,s)
 	mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
 }

Line 0 Link Here

(-)files/patch-src_cpu_core__dyn__x86_risc__x86.h (+11 lines)
	1	--- src/cpu/core_dyn_x86/risc_x86.h.orig 2018-10-01 09:03:42 UTC
	2	+++ src/cpu/core_dyn_x86/risc_x86.h
	3	@@ -138,7 +138,7 @@ return_address:
	4	"run_return_adress: \n"
	5	"popl %%ebp \n"
	6	:"=a" (retval), "=c" (tempflags)
	7	- :"r" (tempflags),"r" (code)
	8	+ :"a" (tempflags),"r" (code)
	9	:"%edx","%ebx","%edi","%esi","cc","memory"
	10	);
	11	reg_flags=(reg_flags & ~FMASK_TEST) \| (tempflags & FMASK_TEST);

Lines 1-11 Link Here

(-)files/patch-src_cpu_core_dyn_x86_risc_x86.h (-11 lines)
1	--- src/cpu/core_dyn_x86/risc_x86.h.orig 2014-12-31 12:59:53.015190887 +0000
2	+++ src/cpu/core_dyn_x86/risc_x86.h 2014-12-31 13:00:30.953180886 +0000
3	@@ -138,7 +138,7 @@
4	"run_return_adress: \n"
5	"popl %%ebp \n"
6	:"=a" (retval), "=c" (tempflags)
7	- :"r" (tempflags),"r" (code)
8	+ :"a" (tempflags),"r" (code)
9	:"%edx","%ebx","%edi","%esi","cc","memory"
10	);
11	reg_flags=(reg_flags & ~FMASK_TEST) \| (tempflags & FMASK_TEST);




*** src/gui/sdlmain.cpp.orig	Mon Mar  6 03:02:24 2017
--- src/gui/sdlmain.cpp	Mon Mar  6 03:03:21 2017
***************
*** 1134,1143 ****
  #endif
  	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
  	if(gl_ext && *gl_ext){
! 		sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
! 		sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
  #if defined(NVIDIA_PixelDataRange)
! 		sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
  			glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
  		sdl.opengl.pixel_data_range = 0;
  #endif
--- 1134,1143 ----
  #endif
  	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
  	if(gl_ext && *gl_ext){
! 		sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != 0);
! 		sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != 0);
  #if defined(NVIDIA_PixelDataRange)
! 		sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") != 0 ) &&
  			glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
  		sdl.opengl.pixel_data_range = 0;
  #endif

Lines 1-11 Link Here

(-)files/patch-src_ints_int10_vesa.cpp (-11 lines)
1	--- src/ints/int10_vesa.cpp.orig 2018-01-28 08:20:24.891924000 -0800
2	+++ src/ints/int10_vesa.cpp 2018-01-28 08:20:38.015119000 -0800
3	@@ -39,7 +39,7 @@ static struct {
4	static char string_oem[]="S3 Incorporated. Trio64";
5	static char string_vendorname[]="DOSBox Development Team";
6	static char string_productname[]="DOSBox - The DOS Emulator";
7	-static char string_productrev[]="DOSBox "VERSION;
8	+static char string_productrev[]="DOSBox " VERSION;
9
10	#ifdef _MSC_VER
11	#pragma pack (1)

Return to bug 231845

Lines 3-11 Link Here

(-)Makefile (-3 / +4 lines)
3		3
4	PORTNAME= dosbox	4	PORTNAME= dosbox
5	PORTVERSION= 0.74	5	PORTVERSION= 0.74
6	PORTREVISION= 11	6	PORTREVISION= 12
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= SF	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
		9	DISTNAME= ${PORTNAME}-${PORTVERSION}-2
9		10
10	MAINTAINER= knyght@gmail.com	11	MAINTAINER= knyght@gmail.com
11	COMMENT= Emulator of a PC with DOS	12	COMMENT= Emulator of a PC with DOS
Lines 25-31 Link Here
25		26
26	DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \	27	DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
27	"${PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \	28	"${PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \
28	"System;Emulator;" "true"	29	"System;Emulator;" true
29		30
30	OPTIONS_DEFINE= DOCS	31	OPTIONS_DEFINE= DOCS
31	OPTIONS_RADIO= DEBUGGER	32	OPTIONS_RADIO= DEBUGGER

Lines 1-14 Link Here

(-)files/patch-src-cpu_core_dynrec_risc_x64.h (-14 lines)
1	Index: src/cpu/core_dynrec/risc_x64.h
2	===================================================================
3	--- src/cpu/core_dynrec/risc_x64.h (revision 3775)
4	+++ src/cpu/core_dynrec/risc_x64.h (working copy)
5	@@ -85,7 +85,8 @@
6
7	static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
8	Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
9	- if ((diff<0x80000000LL) && (diff>-0x80000000LL)) {
10	+ if ((Bit64u)diff<0x0000000080000000ULL \|\|
11	+ (Bit64u)diff>0xffffffff80000000ULL) {
12	cache_addb(0x05+(reg<<3));
13	// RIP-relative addressing is offset after the instruction
14	cache_addd((Bit32u)(((Bit64u)diff)&0xffffffffLL));

Lines 1-24 Link Here

(-)files/patch-src-fpu-fpu_instructions_x86.h (-24 lines)
1	Index: src/fpu/fpu_instructions_x86.h
2	@@ -1162,12 +1162,12 @@
3
4	static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
5	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
6	- FPUD_LOAD(fild,WORD,)
7	+ FPUD_LOAD(fild,WORD,s)
8	}
9
10	static void FPU_FLD_I16_EA(PhysPt addr) {
11	fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
12	- FPUD_LOAD_EA(fild,WORD,)
13	+ FPUD_LOAD_EA(fild,WORD,s)
14	}
15
16	static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
17	@@ -1212,7 +1212,7 @@
18	}
19
20	static void FPU_FST_I16(PhysPt addr) {
21	- FPUD_STORE(fistp,WORD,)
22	+ FPUD_STORE(fistp,WORD,s)
23	mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
24	}

Lines 1-25 Link Here

(-)files/patch-src_gui_sdlmain.cpp (-25 lines)
1	*** src/gui/sdlmain.cpp.orig Mon Mar 6 03:02:24 2017
2	--- src/gui/sdlmain.cpp Mon Mar 6 03:03:21 2017
3	***************
4	* 1134,1143 **
5	#endif
6	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
7	if(gl_ext && *gl_ext){
8	! sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
9	! sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
10	#if defined(NVIDIA_PixelDataRange)
11	! sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
12	glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
13	sdl.opengl.pixel_data_range = 0;
14	#endif
15	--- 1134,1143 ----
16	#endif
17	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
18	if(gl_ext && *gl_ext){
19	! sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != 0);
20	! sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != 0);
21	#if defined(NVIDIA_PixelDataRange)
22	! sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") != 0 ) &&
23	glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
24	sdl.opengl.pixel_data_range = 0;
25	#endif