ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/video_vosf.h

Comparing BasiliskII/src/Unix/video_vosf.h (file contents):
Revision 1.7 by cebix, 2000-10-13T16:47:52Z vs.
Revision 1.32 by gbeauche, 2002-05-16T15:48:06Z

#	Line 1 | Line 1
1		/*
2		*  video_vosf.h - Video/graphics emulation, video on SEGV signals support
3		*
4	<	*  Basilisk II (C) 1997-2000 Christian Bauer
4	>	*  Basilisk II (C) 1997-2002 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 24 | Line 24
24		// Note: this file is #include'd in video_x.cpp
25		#ifdef ENABLE_VOSF
26
27	<	/*
28	<	*  Page-aligned memory allocation
29	<	*/
30	<
31	<	// Align on page boundaries
32	<	static uintptr align_on_page_boundary(uintptr size)
33	<	{
34	<	const uint32 page_size = getpagesize();
35	<	const uint32 page_mask = page_size - 1;
36	<	return (size + page_mask) & ~page_mask;
37	<	}
38	<
39	<	// Allocate memory on page boundary
40	<	static void * allocate_framebuffer(uint32 size, uint8 * hint = 0)
41	<	{
42	<	// Remind that the system can allocate at 0x00000000...
43	<	return mmap((caddr_t)hint, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zero_fd, 0);
44	<	}
27	>	#include <fcntl.h>
28	>	#include <sys/mman.h>
29	>	#include "sigsegv.h"
30	>	#include "vm_alloc.h"
31
32	+	// Variables for Video on SEGV support
33	+	static uint8 *the_host_buffer;  // Host frame buffer in VOSF mode
34
35	<	/*
36	<	*      Screen depth identification
49	<	*/
50	<
51	<	enum {
52	<	ID_DEPTH_UNKNOWN = -1,
53	<	ID_DEPTH_1,
54	<	ID_DEPTH_8,
55	<	ID_DEPTH_15,
56	<	ID_DEPTH_16,
57	<	ID_DEPTH_24,
58	<	ID_DEPTH_32 = ID_DEPTH_24,
59	<	ID_DEPTH_COUNT
35	>	struct ScreenPageInfo {
36	>	int top, bottom;                    // Mapping between this virtual page and Mac scanlines
37		};
38
39	<	static int depth_id(int depth)
40	<	{
41	<	int id;
42	<	switch (depth) {
43	<	case 1  : id = ID_DEPTH_1;      break;
44	<	case 8  : id = ID_DEPTH_8;      break;
45	<	case 15 : id = ID_DEPTH_15;     break;
46	<	case 16 : id = ID_DEPTH_16;     break;
47	<	case 24 : id = ID_DEPTH_24;     break;
48	<	case 32 : id = ID_DEPTH_32;     break;
49	<	default : id = ID_DEPTH_UNKNOWN;
50	<	}
74	<	return id;
75	<	}
76	<
77	<
78	<	/*
79	<	*      Frame buffer copy function templates
80	<	*/
39	>	struct ScreenInfo {
40	>	uintptr memStart;                   // Start address aligned to page boundary
41	>	uint32 memLength;                   // Length of the memory addressed by the screen pages
42	>
43	>	uintptr pageSize;                   // Size of a page
44	>	int pageBits;                               // Shift count to get the page number
45	>	uint32 pageCount;                   // Number of pages allocated to the screen
46	>
47	>	bool dirty;                                     // Flag: set if the frame buffer was touched
48	>	char * dirtyPages;                  // Table of flags set if page was altered
49	>	ScreenPageInfo * pageInfo;  // Table of mappings page -> Mac scanlines
50	>	};
51
52	<	// No conversion required
52	>	static ScreenInfo mainBuffer;
53
54	<	#define MEMCPY_PROFITABLE
55	<	#ifdef MEMCPY_PROFITABLE
56	<	static void do_fbcopy_raw(uint8 * dest, const uint8 * source, uint32 length)
57	<	{
58	<	memcpy(dest, source, length);
59	<	}
54	>	#define PFLAG_SET_VALUE                 0x00
55	>	#define PFLAG_CLEAR_VALUE               0x01
56	>	#define PFLAG_SET_VALUE_4               0x00000000
57	>	#define PFLAG_CLEAR_VALUE_4             0x01010101
58	>	#define PFLAG_SET(page)                 mainBuffer.dirtyPages[page] = PFLAG_SET_VALUE
59	>	#define PFLAG_CLEAR(page)               mainBuffer.dirtyPages[page] = PFLAG_CLEAR_VALUE
60	>	#define PFLAG_ISSET(page)               (mainBuffer.dirtyPages[page] == PFLAG_SET_VALUE)
61	>	#define PFLAG_ISCLEAR(page)             (mainBuffer.dirtyPages[page] != PFLAG_SET_VALUE)
62	>
63	>	#ifdef UNALIGNED_PROFITABLE
64	>	# define PFLAG_ISSET_4(page)    (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_SET_VALUE_4)
65	>	# define PFLAG_ISCLEAR_4(page)  (*((uint32 *)(mainBuffer.dirtyPages + (page))) == PFLAG_CLEAR_VALUE_4)
66		#else
67	<	#define FB_BLIT_1(dst, src)     (dst = (src))
68	<	#define FB_BLIT_2(dst, src)     (dst = (src))
69	<	#define FB_DEPTH                        0
70	<	#define FB_FUNC_NAME            do_fbcopy_raw
71	<	#include "video_blit.h"
72	<	#endif
73	<
74	<
75	<	// RGB 555
76	<
77	<	#ifdef WORDS_BIGENDIAN
78	<	# define FB_FUNC_NAME do_fbcopy_15_obo
67	>	# define PFLAG_ISSET_4(page) \
68	>	PFLAG_ISSET(page  ) && PFLAG_ISSET(page+1) \
69	>	&&      PFLAG_ISSET(page+2) && PFLAG_ISSET(page+3)
70	>	# define PFLAG_ISCLEAR_4(page) \
71	>	PFLAG_ISCLEAR(page  ) && PFLAG_ISCLEAR(page+1) \
72	>	&&      PFLAG_ISCLEAR(page+2) && PFLAG_ISCLEAR(page+3)
73	>	#endif
74	>
75	>	// Set the selected page range [ first_page, last_page [ into the SET state
76	>	#define PFLAG_SET_RANGE(first_page, last_page) \
77	>	memset(mainBuffer.dirtyPages + (first_page), PFLAG_SET_VALUE, \
78	>	(last_page) - (first_page))
79	>
80	>	// Set the selected page range [ first_page, last_page [ into the CLEAR state
81	>	#define PFLAG_CLEAR_RANGE(first_page, last_page) \
82	>	memset(mainBuffer.dirtyPages + (first_page), PFLAG_CLEAR_VALUE, \
83	>	(last_page) - (first_page))
84	>
85	>	#define PFLAG_SET_ALL do { \
86	>	PFLAG_SET_RANGE(0, mainBuffer.pageCount); \
87	>	mainBuffer.dirty = true; \
88	>	} while (0)
89	>
90	>	#define PFLAG_CLEAR_ALL do { \
91	>	PFLAG_CLEAR_RANGE(0, mainBuffer.pageCount); \
92	>	mainBuffer.dirty = false; \
93	>	} while (0)
94	>
95	>	// Set the following macro definition to 1 if your system
96	>	// provides a really fast strchr() implementation
97	>	//#define HAVE_FAST_STRCHR 0
98	>
99	>	static inline int find_next_page_set(int page)
100	>	{
101	>	#if HAVE_FAST_STRCHR
102	>	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_SET_VALUE);
103	>	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
104		#else
105	<	# define FB_FUNC_NAME do_fbcopy_15_nbo
105	>	while (PFLAG_ISCLEAR_4(page))
106	>	page += 4;
107	>	while (PFLAG_ISCLEAR(page))
108	>	page++;
109	>	return page;
110		#endif
111	+	}
112
113	<	#define FB_BLIT_1(dst, src) \
114	<	(dst = (((src) >> 8) & 0xff) | (((src) & 0xff) << 8))
115	<
116	<	#define FB_BLIT_2(dst, src) \
117	<	(dst = (((src) >> 8) & 0x00ff00ff) | (((src) & 0x00ff00ff) << 8))
112	<
113	<	#define FB_DEPTH 15
114	<	#include "video_blit.h"
115	<
116	<
117	<	// RGB 565
118	<
119	<	#ifdef WORDS_BIGENDIAN
120	<
121	<	// native byte order
122	<
123	<	#define FB_BLIT_1(dst, src) \
124	<	(dst = (((src) & 0x1f) | (((src) << 1) & 0xffc0)))
125	<
126	<	#define FB_BLIT_2(dst, src) \
127	<	(dst = (((src) & 0x001f001f) | (((src) << 1) & 0xffc0ffc0)))
128	<
129	<	#define FB_DEPTH 16
130	<	#define FB_FUNC_NAME do_fbcopy_16_nbo
131	<	#include "video_blit.h"
132	<
133	<	// opposite byte order (untested)
134	<
135	<	#define FB_BLIT_1(dst, src) \
136	<	(dst = ((((src) >> 6) & 0xff) | (((src) & 0x60) << 9)))
137	<
138	<	#define FB_BLIT_2(dst, src) \
139	<	(dst = ((((src) >> 6) & 0x00ff00ff) | (((src) & 0x00600060) << 9)))
140	<
141	<	#define FB_DEPTH 16
142	<	#define FB_FUNC_NAME do_fbcopy_16_obo
143	<	#include "video_blit.h"
144	<
113	>	static inline int find_next_page_clear(int page)
114	>	{
115	>	#if HAVE_FAST_STRCHR
116	>	char *match = strchr(mainBuffer.dirtyPages + page, PFLAG_CLEAR_VALUE);
117	>	return match ? match - mainBuffer.dirtyPages : mainBuffer.pageCount;
118		#else
119	<
120	<	// native byte order
121	<
122	<	#define FB_BLIT_1(dst, src) \
123	<	(dst = (((src) >> 8) & 0x001f) | (((src) << 9) & 0xfe00) | (((src) >> 7) & 0x01c0))
151	<
152	<	#define FB_BLIT_2(dst, src) \
153	<	(dst = (((src) >> 8) & 0x001f001f) | (((src) << 9) & 0xfe00fe00) | (((src) >> 7) & 0x01c001c0))
154	<
155	<	#define FB_DEPTH 16
156	<	#define FB_FUNC_NAME do_fbcopy_16_nbo
157	<	#include "video_blit.h"
158	<
159	<	// opposite byte order (untested)
160	<
161	<	#define FB_BLIT_1(dst, src) \
162	<	(dst = (((src) & 0x1f00) | (((src) << 1) & 0xe0fe) | (((src) >> 15) & 1)))
163	<
164	<	#define FB_BLIT_2(dst, src) \
165	<	(dst = (((src) & 0x1f001f00) | (((src) << 1) & 0xe0fee0fe) | (((src) >> 15) & 0x10001)))
166	<
167	<	#define FB_DEPTH 16
168	<	#define FB_FUNC_NAME do_fbcopy_16_obo
169	<	#include "video_blit.h"
170	<
119	>	while (PFLAG_ISSET_4(page))
120	>	page += 4;
121	>	while (PFLAG_ISSET(page))
122	>	page++;
123	>	return page;
124		#endif
125	+	}
126
127	<	// RGB 888
128	<
129	<	#ifdef WORDS_BIGENDIAN
130	<	# define FB_FUNC_NAME do_fbcopy_24_obo
127	>	#ifdef HAVE_PTHREADS
128	>	static pthread_mutex_t vosf_lock = PTHREAD_MUTEX_INITIALIZER;   // Mutex to protect frame buffer (dirtyPages in fact)
129	>	#define LOCK_VOSF pthread_mutex_lock(&vosf_lock);
130	>	#define UNLOCK_VOSF pthread_mutex_unlock(&vosf_lock);
131		#else
132	<	# define FB_FUNC_NAME do_fbcopy_24_nbo
132	>	#define LOCK_VOSF
133	>	#define UNLOCK_VOSF
134		#endif
135
136	<	#define FB_BLIT_1(dst, src) \
137	<	(dst = (src))
138	<
139	<	#define FB_BLIT_2(dst, src) \
140	<	(dst = (((src) >> 24) & 0xff) | (((src) >> 8) & 0xff00) | (((src) & 0xff00) << 8) | (((src) & 0xff) << 24))
136	>	static int log_base_2(uint32 x)
137	>	{
138	>	uint32 mask = 0x80000000;
139	>	int l = 31;
140	>	while (l >= 0 && (x & mask) == 0) {
141	>	mask >>= 1;
142	>	l--;
143	>	}
144	>	return l;
145	>	}
146
147	<	#define FB_DEPTH 24
148	<	#include "video_blit.h"
147	>	// Extend size to page boundary
148	>	static uint32 page_extend(uint32 size)
149	>	{
150	>	const uint32 page_size = getpagesize();
151	>	const uint32 page_mask = page_size - 1;
152	>	return (size + page_mask) & ~page_mask;
153	>	}
154
155
156		/*
157	<	*      Frame buffer copy functions map table
157	>	*  Initialize the VOSF system (mainBuffer structure, SIGSEGV handler)
158		*/
159
160	<	typedef void (*fbcopy_func)(uint8 *, const uint8 *, uint32);
196	<	static fbcopy_func do_update_framebuffer;
197	<
198	<	#define FBCOPY_FUNC(aHandler) do_ ## aHandler
199	<
200	<	#if REAL_ADDRESSING || DIRECT_ADDRESSING
201	<	#define WD(X) { FBCOPY_FUNC(X), FBCOPY_FUNC(X) }
202	<	#else
203	<	#define WD(X) { FBCOPY_FUNC(fbcopy_raw), FBCOPY_FUNC(fbcopy_raw) }
204	<	#endif
205	<
206	<	// fb_copy_funcs[depth_id][native_byte_order][dga_mode]
207	<	// NT  : not tested
208	<	// OK  : has been successfully tested
209	<	// NBO : native byte order
210	<	// OBO : opposite byte order
211	<	static fbcopy_func fbcopy_funcs[ID_DEPTH_COUNT][2][2] = {
212	<	#ifdef WORDS_BIGENDIAN
213	<	/*      opposite byte order             native byte order       */
214	<	/*  1 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_raw)          },      // NT
215	<	/*  8 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_raw)          },      // OK (NBO)
216	<	/* 15 bpp */    {       WD(fbcopy_15_obo)       ,       WD(fbcopy_raw)          },      // NT
217	<	/* 16 bpp */    {       WD(fbcopy_16_obo)       ,       WD(fbcopy_16_nbo)       },      // NT
218	<	/* 24 bpp */    {       WD(fbcopy_24_obo)       ,       WD(fbcopy_raw)          }       // NT
219	<	#else
220	<	/*      opposite byte order             native byte order       */
221	<	/*  1 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_raw)          },      // NT
222	<	/*  8 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_raw)          },      // OK (NBO)
223	<	/* 15 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_15_nbo)       },      // OK (NBO)
224	<	/* 16 bpp */    {       WD(fbcopy_16_obo)       ,       WD(fbcopy_16_nbo)       },      // OK (NBO)
225	<	/* 24 bpp */    {       WD(fbcopy_raw)          ,       WD(fbcopy_24_nbo)       }       // NT
226	<	#endif
227	<	};
228	<
229	<	#undef WD
160	>	static bool screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction);
161
162	<	#define FBCOPY_FUNC_ERROR \
232	<	ErrorAlert("Invalid screen depth")
233	<
234	<	#define GET_FBCOPY_FUNC(aDepth, aNativeByteOrder, aDisplay) \
235	<	((depth_id(aDepth) == ID_DEPTH_UNKNOWN) ? ( FBCOPY_FUNC_ERROR, (fbcopy_func)0 ) : \
236	<	fbcopy_funcs[depth_id(aDepth)][(aNativeByteOrder)][(aDisplay) == DISPLAY_DGA ? 1 : 0])
237	<
238	<
239	<	/*
240	<	*      Screen fault handler
241	<	*/
242	<
243	<	static inline void do_handle_screen_fault(uintptr addr)
162	>	static bool video_vosf_init(X11_monitor_desc &monitor)
163		{
164	<	if ((addr < mainBuffer.memStart) || (addr >= mainBuffer.memEnd)) {
165	<	fprintf(stderr, "Segmentation fault at 0x%08X\n", addr);
166	<	abort();
164	>	const video_mode &mode = monitor.get_current_mode();
165	>
166	>	const uintptr page_size = getpagesize();
167	>	const uintptr page_mask = page_size - 1;
168	>
169	>	// Round up frame buffer base to page boundary
170	>	mainBuffer.memStart = (((uintptr) the_buffer) + page_mask) & ~page_mask;
171	>
172	>	// The frame buffer size shall already be aligned to page boundary (use page_extend)
173	>	mainBuffer.memLength = the_buffer_size;
174	>
175	>	mainBuffer.pageSize = page_size;
176	>	mainBuffer.pageBits = log_base_2(mainBuffer.pageSize);
177	>	mainBuffer.pageCount =  (mainBuffer.memLength + page_mask)/mainBuffer.pageSize;
178	>
179	>	// The "2" more bytes requested are a safety net to insure the
180	>	// loops in the update routines will terminate.
181	>	// See "How can we deal with array overrun conditions ?" hereunder for further details.
182	>	mainBuffer.dirtyPages = (char *) malloc(mainBuffer.pageCount + 2);
183	>	if (mainBuffer.dirtyPages == NULL)
184	>	return false;
185	>
186	>	PFLAG_CLEAR_ALL;
187	>	PFLAG_CLEAR(mainBuffer.pageCount);
188	>	PFLAG_SET(mainBuffer.pageCount+1);
189	>
190	>	// Allocate and fill in pageInfo with start and end (inclusive) row in number of bytes
191	>	mainBuffer.pageInfo = (ScreenPageInfo *) malloc(mainBuffer.pageCount * sizeof(ScreenPageInfo));
192	>	if (mainBuffer.pageInfo == NULL)
193	>	return false;
194	>
195	>	uint32 a = 0;
196	>	for (unsigned i = 0; i < mainBuffer.pageCount; i++) {
197	>	unsigned y1 = a / mode.bytes_per_row;
198	>	if (y1 >= mode.y)
199	>	y1 = mode.y - 1;
200	>
201	>	unsigned y2 = (a + mainBuffer.pageSize) / mode.bytes_per_row;
202	>	if (y2 >= mode.y)
203	>	y2 = mode.y - 1;
204	>
205	>	mainBuffer.pageInfo[i].top = y1;
206	>	mainBuffer.pageInfo[i].bottom = y2;
207	>
208	>	a += mainBuffer.pageSize;
209	>	if (a > mainBuffer.memLength)
210	>	a = mainBuffer.memLength;
211		}
212
213	<	const int page  = (addr - mainBuffer.memStart) >> mainBuffer.pageBits;
214	<	caddr_t page_ad = (caddr_t)(addr & ~(mainBuffer.pageSize - 1));
215	<	#ifdef HAVE_PTHREADS
216	<	pthread_mutex_lock(&Screen_draw_lock);
217	<	#endif
218	<	PFLAG_SET(page);
219	<	mprotect(page_ad, mainBuffer.pageSize, PROT_READ | PROT_WRITE);
220	<	#ifdef HAVE_PTHREADS
221	<	pthread_mutex_unlock(&Screen_draw_lock);
222	<	#endif
223	<	}
261	<
262	<	#if defined(HAVE_SIGINFO_T)
263	<
264	<	static void Screen_fault_handler(int, siginfo_t * sip, void *)
265	<	{
266	<	D(bug("Screen_fault_handler: ADDR=0x%08X\n", sip->si_addr));
267	<	do_handle_screen_fault((uintptr)sip->si_addr);
213	>	// We can now write-protect the frame buffer
214	>	if (vm_protect((char *)mainBuffer.memStart, mainBuffer.memLength, VM_PAGE_READ) != 0)
215	>	return false;
216	>
217	>	// Initialize the handler for SIGSEGV
218	>	if (!sigsegv_install_handler(screen_fault_handler))
219	>	return false;
220	>
221	>	// The frame buffer is sane, i.e. there is no write to it yet
222	>	mainBuffer.dirty = false;
223	>	return true;
224		}
225
270	–	#elif defined(HAVE_SIGCONTEXT_SUBTERFUGE)
271	–
272	–	# if defined(__i386__) && defined(__linux__)
273	–	static void Screen_fault_handler(int, struct sigcontext scs)
274	–	{
275	–	D(bug("Screen_fault_handler: ADDR=0x%08X from IP=0x%08X\n", scs.cr2, scs.eip));
276	–	do_handle_screen_fault((uintptr)scs.cr2);
277	–	}
226
227	<	# elif defined(__m68k__) && defined(__NetBSD__)
227	>	/*
228	>	* Deinitialize VOSF system
229	>	*/
230
231	<	# include <m68k/frame.h>
282	<	static void Screen_fault_handler(int, int code, struct sigcontext *scp)
231	>	static void video_vosf_exit(void)
232		{
233	<	D(bug("Screen_fault_handler: ADDR=0x%08X\n", code));
234	<	struct sigstate {
235	<	int ss_flags;
236	<	struct frame ss_frame;
237	<	};
238	<	struct sigstate *state = (struct sigstate *)scp->sc_ap;
239	<	uintptr fault_addr;
291	<	switch (state->ss_frame.f_format) {
292	<	case 7:         // 68040 access error
293	<	// "code" is sometimes unreliable (i.e. contains NULL or a bogus address), reason unknown
294	<	fault_addr = state->ss_frame.f_fmt7.f_fa;
295	<	break;
296	<	default:
297	<	fault_addr = (uintptr)code;
298	<	break;
233	>	if (mainBuffer.pageInfo) {
234	>	free(mainBuffer.pageInfo);
235	>	mainBuffer.pageInfo = NULL;
236	>	}
237	>	if (mainBuffer.dirtyPages) {
238	>	free(mainBuffer.dirtyPages);
239	>	mainBuffer.dirtyPages = NULL;
240		}
300	–	do_handle_screen_fault(fault_addr);
241		}
242
303	–	# else
304	–	#  error "No suitable subterfuge for Video on SEGV signals"
305	–	# endif
306	–	#else
307	–	# error "Can't do Video on SEGV signals"
308	–	#endif
309	–
243
244		/*
245	<	*      Screen fault handler initialization
245	>	* Screen fault handler
246		*/
247
248	<	#if defined(HAVE_SIGINFO_T)
316	<	static bool Screen_fault_handler_init()
317	<	{
318	<	// Setup SIGSEGV handler to process writes to frame buffer
319	<	sigemptyset(&vosf_sa.sa_mask);
320	<	vosf_sa.sa_sigaction = Screen_fault_handler;
321	<	vosf_sa.sa_flags = SA_SIGINFO;
322	<	return (sigaction(SIGSEGV, &vosf_sa, NULL) == 0);
323	<	}
324	<	#elif defined(HAVE_SIGCONTEXT_SUBTERFUGE)
325	<	static bool Screen_fault_handler_init()
248	>	static bool screen_fault_handler(sigsegv_address_t fault_address, sigsegv_address_t fault_instruction)
249		{
250	<	// Setup SIGSEGV handler to process writes to frame buffer
251	<	sigemptyset(&vosf_sa.sa_mask);
252	<	vosf_sa.sa_handler = (void (*)(int)) Screen_fault_handler;
253	<	#if !EMULATED_68K && defined(__NetBSD__)
254	<	sigaddset(&vosf_sa.sa_mask, SIGALRM);
255	<	vosf_sa.sa_flags = SA_ONSTACK;
256	<	#else
257	<	vosf_sa.sa_flags = 0;
258	<	#endif
259	<	return (sigaction(SIGSEGV, &vosf_sa, NULL) == 0);
250	>	//      D(bug("screen_fault_handler: ADDR=%p from IP=%p\n", fault_address, fault_instruction));
251	>	const uintptr addr = (uintptr)fault_address;
252	>
253	>	/* Someone attempted to write to the frame buffer. Make it writeable
254	>	* now so that the data could actually be written to. It will be made
255	>	* read-only back in one of the screen update_*() functions.
256	>	*/
257	>	if (((uintptr)addr - mainBuffer.memStart) < mainBuffer.memLength) {
258	>	const int page  = ((uintptr)addr - mainBuffer.memStart) >> mainBuffer.pageBits;
259	>	LOCK_VOSF;
260	>	PFLAG_SET(page);
261	>	vm_protect((char *)(addr & -mainBuffer.pageSize), mainBuffer.pageSize, VM_PAGE_READ | VM_PAGE_WRITE);
262	>	mainBuffer.dirty = true;
263	>	UNLOCK_VOSF;
264	>	return true;
265	>	}
266	>
267	>	/* Otherwise, we don't know how to handle the fault, let it crash */
268	>	return false;
269		}
338	–	#endif
270
271
272		/*
273		*      Update display for Windowed mode and VOSF
274		*/
275
276	<	static inline void update_display_window_vosf(void)
276	>	// From video_blit.cpp
277	>	extern void (*Screen_blit)(uint8 * dest, const uint8 * source, uint32 length);
278	>	extern bool Screen_blitter_init(XVisualInfo * visual_info, bool native_byte_order, video_depth mac_depth);
279	>	extern uint32 ExpandMap[256];
280	>
281	>	/*      How can we deal with array overrun conditions ?
282	>
283	>	The state of the framebuffer pages that have been touched are maintained
284	>	in the dirtyPages[] table. That table is (pageCount + 2) bytes long.
285	>
286	>	Terminology
287	>
288	>	"Last Page" denotes the pageCount-nth page, i.e. dirtyPages[pageCount - 1].
289	>	"CLEAR Page Guard" refers to the page following the Last Page but is always
290	>	in the CLEAR state. "SET Page Guard" refers to the page following the CLEAR
291	>	Page Guard but is always in the SET state.
292	>
293	>	Rough process
294	>
295	>	The update routines must determine which pages have to be blitted to the
296	>	screen. This job consists in finding the first_page that was touched.
297	>	i.e. find the next page that is SET. Then, finding how many pages were
298	>	touched starting from first_page. i.e. find the next page that is CLEAR.
299	>
300	>	There are two cases to check:
301	>
302	>	- Last Page is CLEAR: find_next_page_set() will reach the SET Page Guard
303	>	but it is beyond the valid pageCount value. Therefore, we exit from the
304	>	update routine.
305	>
306	>	- Last Page is SET: first_page equals (pageCount - 1) and
307	>	find_next_page_clear() will reach the CLEAR Page Guard. We blit the last
308	>	page to the screen. On the next iteration, page equals pageCount and
309	>	find_next_page_set() will reach the SET Page Guard. We still safely exit
310	>	from the update routine because the SET Page Guard position is greater
311	>	than pageCount.
312	>	*/
313	>
314	>	static inline void update_display_window_vosf(driver_window *drv)
315		{
316	+	const video_mode &mode = drv->monitor.get_current_mode();
317	+
318		int page = 0;
319		for (;;) {
320	<	while (PFLAG_ISCLEAR_4(page))
321	<	page += 4;
351	<
352	<	while (PFLAG_ISCLEAR(page))
353	<	page++;
354	<
355	<	if (page >= mainBuffer.pageCount)
320	>	const unsigned first_page = find_next_page_set(page);
321	>	if (first_page >= mainBuffer.pageCount)
322		break;
323	<
324	<	const int first_page = page;
325	<	while ((page < mainBuffer.pageCount) && PFLAG_ISSET(page)) {
360	<	PFLAG_CLEAR(page);
361	<	++page;
362	<	}
323	>
324	>	page = find_next_page_clear(first_page);
325	>	PFLAG_CLEAR_RANGE(first_page, page);
326
327		// Make the dirty pages read-only again
328		const int32 offset  = first_page << mainBuffer.pageBits;
329		const uint32 length = (page - first_page) << mainBuffer.pageBits;
330	<	mprotect((caddr_t)(mainBuffer.memStart + offset), length, PROT_READ);
330	>	vm_protect((char *)mainBuffer.memStart + offset, length, VM_PAGE_READ);
331
332		// There is at least one line to update
333		const int y1 = mainBuffer.pageInfo[first_page].top;
334		const int y2 = mainBuffer.pageInfo[page - 1].bottom;
335		const int height = y2 - y1 + 1;
336
337	<	const int bytes_per_row = VideoMonitor.bytes_per_row;
375	<	const int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
376	<	int i, j;
377	<
378	<	// Check for first column from left and first column
379	<	// from right that have changed
380	<	int x1, x2, width;
381	<	if (depth == 1) {
382	<
383	<	x1 = VideoMonitor.x - 1;
384	<	for (j = y1; j <= y2; j++) {
385	<	uint8 * const p1 = &the_buffer[j * bytes_per_row];
386	<	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
387	<	for (i = 0; i < (x1>>3); i++) {
388	<	if (p1[i] != p2[i]) {
389	<	x1 = i << 3;
390	<	break;
391	<	}
392	<	}
393	<	}
394	<
395	<	x2 = x1;
396	<	for (j = y2; j >= y1; j--) {
397	<	uint8 * const p1 = &the_buffer[j * bytes_per_row];
398	<	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
399	<	for (i = (VideoMonitor.x>>3) - 1; i > (x2>>3); i--) {
400	<	if (p1[i] != p2[i]) {
401	<	x2 = (i << 3) + 7;
402	<	break;
403	<	}
404	<	}
405	<	}
406	<	width = x2 - x1 + 1;
337	>	if (mode.depth < VDEPTH_8BIT) {
338
339		// Update the_host_buffer and copy of the_buffer
340	<	i = y1 * bytes_per_row + (x1 >> 3);
340	>	const int src_bytes_per_row = mode.bytes_per_row;
341	>	const int dst_bytes_per_row = drv->img->bytes_per_line;
342	>	const int pixels_per_byte = mode.x / src_bytes_per_row;
343	>	int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j;
344		for (j = y1; j <= y2; j++) {
345	<	do_update_framebuffer(the_host_buffer + i, the_buffer + i, width >> 3);
346	<	memcpy(the_buffer_copy + i, the_buffer + i, width >> 3);
347	<	i += bytes_per_row;
345	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, mode.x / pixels_per_byte);
346	>	i1 += src_bytes_per_row;
347	>	i2 += dst_bytes_per_row;
348		}
349
350		} else {
351
418	–	x1 = VideoMonitor.x * bytes_per_pixel - 1;
419	–	for (j = y1; j <= y2; j++) {
420	–	uint8 * const p1 = &the_buffer[j * bytes_per_row];
421	–	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
422	–	for (i = 0; i < x1; i++) {
423	–	if (p1[i] != p2[i]) {
424	–	x1 = i;
425	–	break;
426	–	}
427	–	}
428	–	}
429	–	x1 /= bytes_per_pixel;
430	–
431	–	x2 = x1 * bytes_per_pixel;
432	–	for (j = y2; j >= y1; j--) {
433	–	uint8 * const p1 = &the_buffer[j * bytes_per_row];
434	–	uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
435	–	for (i = VideoMonitor.x * bytes_per_pixel - 1; i > x2; i--) {
436	–	if (p1[i] != p2[i]) {
437	–	x2 = i;
438	–	break;
439	–	}
440	–	}
441	–	}
442	–	x2 /= bytes_per_pixel;
443	–	width = x2 - x1 + 1;
444	–
352		// Update the_host_buffer and copy of the_buffer
353	<	i = y1 * bytes_per_row + x1 * bytes_per_pixel;
353	>	const int src_bytes_per_row = mode.bytes_per_row;
354	>	const int dst_bytes_per_row = drv->img->bytes_per_line;
355	>	const int bytes_per_pixel = src_bytes_per_row / mode.x;
356	>	int i1 = y1 * src_bytes_per_row, i2 = y1 * dst_bytes_per_row, j;
357		for (j = y1; j <= y2; j++) {
358	<	do_update_framebuffer(the_host_buffer + i, the_buffer + i, bytes_per_pixel * width);
359	<	memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * width);
360	<	i += bytes_per_row;
358	>	Screen_blit(the_host_buffer + i2, the_buffer + i1, bytes_per_pixel * mode.x);
359	>	i1 += src_bytes_per_row;
360	>	i2 += dst_bytes_per_row;
361		}
362		}
363	<
364	<	if (have_shm)
365	<	XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, width, height, 0);
363	>
364	>	if (drv->have_shm)
365	>	XShmPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, mode.x, height, 0);
366		else
367	<	XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, width, height);
367	>	XPutImage(x_display, drv->w, drv->gc, drv->img, 0, y1, 0, y1, mode.x, height);
368		}
369	+	mainBuffer.dirty = false;
370		}
371
372
373		/*
374		*      Update display for DGA mode and VOSF
375	<	*      (only in Direct Addressing mode)
375	>	*      (only in Real or Direct Addressing mode)
376		*/
377
378		#if REAL_ADDRESSING || DIRECT_ADDRESSING
379		static inline void update_display_dga_vosf(void)
380		{
381	+	const video_mode &mode = drv->monitor.get_current_mode();
382	+
383		int page = 0;
384		for (;;) {
385	<	while (PFLAG_ISCLEAR_4(page))
386	<	page += 4;
474	<
475	<	while (PFLAG_ISCLEAR(page))
476	<	page++;
477	<
478	<	if (page >= mainBuffer.pageCount)
385	>	const unsigned first_page = find_next_page_set(page);
386	>	if (first_page >= mainBuffer.pageCount)
387		break;
388	<
389	<	const int first_page = page;
390	<	while ((page < mainBuffer.pageCount) && PFLAG_ISSET(page)) {
391	<	PFLAG_CLEAR(page);
484	<	++page;
485	<	}
486	<
388	>
389	>	page = find_next_page_clear(first_page);
390	>	PFLAG_CLEAR_RANGE(first_page, page);
391	>
392		// Make the dirty pages read-only again
393		const int32 offset  = first_page << mainBuffer.pageBits;
394		const uint32 length = (page - first_page) << mainBuffer.pageBits;
395	<	mprotect((caddr_t)(mainBuffer.memStart + offset), length, PROT_READ);
395	>	vm_protect((char *)mainBuffer.memStart + offset, length, VM_PAGE_READ);
396
397		// I am sure that y2 >= y1 and depth != 1
398		const int y1 = mainBuffer.pageInfo[first_page].top;
399		const int y2 = mainBuffer.pageInfo[page - 1].bottom;
400
401	<	const int bytes_per_row = VideoMonitor.bytes_per_row;
402	<	const int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
401	>	const int bytes_per_row = mode.bytes_per_row;
402	>	const int bytes_per_pixel = mode.bytes_per_row / mode.x;
403		int i, j;
404
405		// Check for first column from left and first column
406		// from right that have changed
407	<	int x1 = VideoMonitor.x * bytes_per_pixel - 1;
407	>	int x1 = mode.x * bytes_per_pixel - 1;
408		for (j = y1; j <= y2; j++) {
409		uint8 * const p1 = &the_buffer[j * bytes_per_row];
410		uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
#	Line 516 | Line 421 | static inline void update_display_dga_vo
421		for (j = y2; j >= y1; j--) {
422		uint8 * const p1 = &the_buffer[j * bytes_per_row];
423		uint8 * const p2 = &the_buffer_copy[j * bytes_per_row];
424	<	for (i = VideoMonitor.x * bytes_per_pixel - 1; i > x2; i--) {
424	>	for (i = mode.x * bytes_per_pixel - 1; i > x2; i--) {
425		if (p1[i] != p2[i]) {
426		x2 = i;
427		break;
#	Line 530 | Line 435 | static inline void update_display_dga_vo
435		const int width = x2 - x1 + 1;
436		i = y1 * bytes_per_row + x1 * bytes_per_pixel;
437		for (j = y1; j <= y2; j++) {
438	<	do_update_framebuffer(the_host_buffer + i, the_buffer + i, bytes_per_pixel * width);
438	>	Screen_blit(the_host_buffer + i, the_buffer + i, bytes_per_pixel * width);
439		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * width);
440		i += bytes_per_row;
441		}
442		}
443	+	mainBuffer.dirty = false;
444		}
445		#endif
446

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines