Mercurial > sdl-ios-xcode
view src/video/riscos/SDL_riscosvideo.c @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Sat, 19 Nov 2005 18:57:00 +0000 |
parents | 974ba6ae0fa3 |
children | d90b362628ea |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ /* File added by Alan Buckley (alan_baa@hotmail.com) for RISC OS compatability 23 March 2003 Implements RISC OS display device management. Routines for full screen and wimp modes are split into other source files. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "SDL.h" #include "SDL_syswm.h" #include "SDL_error.h" #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_sysvideo.h" #include "SDL_pixels_c.h" #include "SDL_events_c.h" #include "SDL_riscostask.h" #include "SDL_riscosvideo.h" #include "SDL_riscosevents_c.h" #include "SDL_riscosmouse_c.h" #include "kernel.h" #include "swis.h" #define RISCOSVID_DRIVER_NAME "riscos" /* Initialization/Query functions */ static int RISCOS_VideoInit(_THIS, SDL_PixelFormat *vformat); static void RISCOS_VideoQuit(_THIS); static SDL_Rect **RISCOS_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); static SDL_Surface *RISCOS_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); int RISCOS_GetWmInfo(_THIS, SDL_SysWMinfo *info); int RISCOS_ToggleFullScreen(_THIS, int fullscreen); /* Mouse checking */ void RISCOS_CheckMouseMode(_THIS); extern SDL_GrabMode RISCOS_GrabInput(_THIS, SDL_GrabMode mode); /* Fullscreen mode functions */ extern SDL_Surface *FULLSCREEN_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); extern void FULLSCREEN_BuildModeList(_THIS); extern void FULLSCREEN_SetDeviceMode(_THIS); extern int FULLSCREEN_ToggleFromWimp(_THIS); /* Wimp mode functions */ extern SDL_Surface *WIMP_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); extern void WIMP_DeleteWindow(_THIS); extern int WIMP_ToggleFromFullScreen(_THIS); /* Hardware surface functions - common to WIMP and FULLSCREEN */ static int RISCOS_AllocHWSurface(_THIS, SDL_Surface *surface); static int RISCOS_LockHWSurface(_THIS, SDL_Surface *surface); static void RISCOS_UnlockHWSurface(_THIS, SDL_Surface *surface); static void RISCOS_FreeHWSurface(_THIS, SDL_Surface *surface); /* RISC OS driver bootstrap functions */ static int RISCOS_Available(void) { return(1); } static void RISCOS_DeleteDevice(SDL_VideoDevice *device) { free(device->hidden); free(device); } static SDL_VideoDevice *RISCOS_CreateDevice(int devindex) { SDL_VideoDevice *device; /* Initialize all variables that we clean on shutdown */ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice)); if ( device ) { memset(device, 0, (sizeof *device)); device->hidden = (struct SDL_PrivateVideoData *) malloc((sizeof *device->hidden)); } if ( (device == NULL) || (device->hidden == NULL) ) { SDL_OutOfMemory(); if ( device ) { free(device); } return(0); } memset(device->hidden, 0, (sizeof *device->hidden)); /* Set the function pointers */ device->VideoInit = RISCOS_VideoInit; device->VideoQuit = RISCOS_VideoQuit; device->ListModes = RISCOS_ListModes; device->SetVideoMode = RISCOS_SetVideoMode; device->CreateYUVOverlay = NULL; device->AllocHWSurface = RISCOS_AllocHWSurface; device->CheckHWBlit = NULL; device->FillHWRect = NULL; device->SetHWColorKey = NULL; device->SetHWAlpha = NULL; device->LockHWSurface = RISCOS_LockHWSurface; device->UnlockHWSurface = RISCOS_UnlockHWSurface; device->FreeHWSurface = RISCOS_FreeHWSurface; device->FreeWMCursor = RISCOS_FreeWMCursor; device->CreateWMCursor = RISCOS_CreateWMCursor; device->CheckMouseMode = RISCOS_CheckMouseMode; device->GrabInput = RISCOS_GrabInput; device->InitOSKeymap = RISCOS_InitOSKeymap; device->GetWMInfo = RISCOS_GetWmInfo; device->free = RISCOS_DeleteDevice; /* Can't get Toggle screen to work if program starts up in Full screen mode so disable it here and re-enable it when a wimp screen is chosen */ device->ToggleFullScreen = NULL; /*RISCOS_ToggleFullScreen;*/ /* Set other entries for fullscreen mode */ FULLSCREEN_SetDeviceMode(device); return device; } VideoBootStrap RISCOS_bootstrap = { RISCOSVID_DRIVER_NAME, "RISC OS video driver", RISCOS_Available, RISCOS_CreateDevice }; int RISCOS_VideoInit(_THIS, SDL_PixelFormat *vformat) { _kernel_swi_regs regs; if (RISCOS_InitTask() == 0) { SDL_SetError("Unable to start task"); return 0; } regs.r[0] = -1; /* Current mode */ regs.r[1] = 9; /* Log base 2 bpp */ _kernel_swi(OS_ReadModeVariable, ®s, ®s); vformat->BitsPerPixel = (1 << regs.r[2]); /* Minimum bpp for SDL is 8 */ if (vformat->BitsPerPixel < 8) vformat->BitsPerPixel = 8; switch (vformat->BitsPerPixel) { case 15: case 16: vformat->Bmask = 0x00007c00; vformat->Gmask = 0x000003e0; vformat->Rmask = 0x0000001f; vformat->BitsPerPixel = 16; /* SDL wants actual number of bits used */ vformat->BytesPerPixel = 2; break; case 24: case 32: vformat->Bmask = 0x00ff0000; vformat->Gmask = 0x0000ff00; vformat->Rmask = 0x000000ff; vformat->BytesPerPixel = 4; break; default: vformat->Bmask = 0; vformat->Gmask = 0; vformat->Rmask = 0; vformat->BytesPerPixel = 1; break; } /* Fill in some window manager capabilities */ this->info.wm_available = 1; /* We're done! */ return(0); } /* Note: If we are terminated, this could be called in the middle of another SDL video routine -- notably UpdateRects. */ void RISCOS_VideoQuit(_THIS) { RISCOS_ExitTask(); if (this->hidden->alloc_bank) free(this->hidden->alloc_bank); this->hidden->alloc_bank = 0; } SDL_Rect **RISCOS_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags) { if (flags & SDL_FULLSCREEN) { /* Build mode list when first required. */ if (SDL_nummodes[0] == 0) FULLSCREEN_BuildModeList(this); return(SDL_modelist[((format->BitsPerPixel+7)/8)-1]); } else return (SDL_Rect **)-1; } /* Set up video mode */ SDL_Surface *RISCOS_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags) { if (flags & SDL_FULLSCREEN) { RISCOS_StoreWimpMode(); /* Dump wimp window on switch to full screen */ if (this->hidden->window_handle) WIMP_DeleteWindow(this); return FULLSCREEN_SetVideoMode(this, current, width, height, bpp, flags); } else { RISCOS_RestoreWimpMode(); return WIMP_SetVideoMode(this, current, width, height, bpp, flags); } } /* We don't actually allow hardware surfaces other than the main one */ static int RISCOS_AllocHWSurface(_THIS, SDL_Surface *surface) { return(-1); } static void RISCOS_FreeHWSurface(_THIS, SDL_Surface *surface) { return; } /* We need to wait for vertical retrace on page flipped displays */ static int RISCOS_LockHWSurface(_THIS, SDL_Surface *surface) { return(0); } static void RISCOS_UnlockHWSurface(_THIS, SDL_Surface *surface) { return; } int RISCOS_GetWmInfo(_THIS, SDL_SysWMinfo *info) { SDL_VERSION(&(info->version)); info->wimpVersion = RISCOS_GetWimpVersion(); info->taskHandle = RISCOS_GetTaskHandle(); info->window = this->hidden->window_handle; return 1; } /* Toggle full screen mode. Returns 1 if successful otherwise 0 */ int RISCOS_ToggleFullScreen(_THIS, int fullscreen) { if (fullscreen) { return FULLSCREEN_ToggleFromWimp(this); } else { return WIMP_ToggleFromFullScreen(this); } return 0; }