Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-27 02:49:42 +00:00
Code Issues Projects Releases Wiki Activity

NQD: use ReadMacInt*() and WriteMacInt*() accessors, i.e. code should now

Browse Source 
be little-endian and 64-bit safe.
This commit is contained in:
gbeauche 2004-04-22 21:45:18 +00:00
parent b4ac3fb507
commit 8b40a7e721
3 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
SheepShaver/src/Unix/video_x.cpp
View File

@ -1679,25 +1679,24 @@ static inline void do_invrect(uint8 *dest, uint32 length)
#undef INVERT_8
}
void NQD_invrect(uint32 arg)
void NQD_invrect(uint32 p)
{
D(bug("accl_invrect %08x\n", arg));
accl_params *p = (accl_params *)arg;
D(bug("accl_invrect %08x\n", p));
// Get inversion parameters
int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
int16 width = p->dest_rect[3] - p->dest_rect[1];
int16 height = p->dest_rect[2] - p->dest_rect[0];
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, p->dest_row_bytes));
D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
//!!?? pen_mode == 14
// And perform the inversion
const int bpp = bytes_per_pixel(p->dest_pixel_size);
const int dest_row_bytes = p->dest_row_bytes;
uint8 *dest = (uint8 *)(p->dest_base_addr + (dest_Y * dest_row_bytes) + (dest_X * bpp));
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
uint8 *dest = (uint8 *)(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
width *= bpp;
switch (bpp) {
case 1:
@ -1790,25 +1789,24 @@ static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
#undef FILL_8
}
void NQD_fillrect(uint32 arg)
void NQD_fillrect(uint32 p)
{
D(bug("accl_fillrect %08x\n", arg));
accl_params *p = (accl_params *)arg;
D(bug("accl_fillrect %08x\n", p));
// Get filling parameters
int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
int16 width = p->dest_rect[3] - p->dest_rect[1];
int16 height = p->dest_rect[2] - p->dest_rect[0];
uint32 color = p->pen_mode == 8 ? p->fore_pen : p->back_pen;
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
uint32 color = ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen);
D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
D(bug(" width %d, height %d\n", width, height));
D(bug(" bytes_per_row %d color %08x\n", p->dest_row_bytes, color));
D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
// And perform the fill
const int bpp = bytes_per_pixel(p->dest_pixel_size);
const int dest_row_bytes = p->dest_row_bytes;
uint8 *dest = (uint8 *)(p->dest_base_addr + (dest_Y * dest_row_bytes) + (dest_X * bpp));
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
uint8 *dest = (uint8 *)(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
width *= bpp;
switch (bpp) {
case 1:
@ -1832,21 +1830,21 @@ void NQD_fillrect(uint32 arg)
}
}
bool NQD_fillrect_hook(uint32 arg)
bool NQD_fillrect_hook(uint32 p)
{
D(bug("accl_fillrect_hook %08x\n", arg));
accl_params *p = (accl_params *)arg;
D(bug("accl_fillrect_hook %08x\n", p));
// Check if we can accelerate this fillrect
if (((uint32 *)p)[0x284 >> 2] != 0 && p->dest_pixel_size >= 8) {
if (p->transfer_mode == 8) {
if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
const int transfer_mode = ReadMacInt32(p + acclTransferMode);
if (transfer_mode == 8) {
// Fill
p->draw_proc = NativeTVECT(NATIVE_FILLRECT);
WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
return true;
}
else if (p->transfer_mode == 10) {
else if (transfer_mode == 10) {
// Invert
p->draw_proc = NativeTVECT(NATIVE_INVRECT);
WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
return true;
}
}
@ -1855,30 +1853,29 @@ bool NQD_fillrect_hook(uint32 arg)
// Rectangle blitting
// TODO: optimize for VOSF and target pixmap == screen
void NQD_bitblt(uint32 arg)
void NQD_bitblt(uint32 p)
{
D(bug("accl_bitblt %08x\n", arg));
accl_params *p = (accl_params *)arg;
D(bug("accl_bitblt %08x\n", p));
// Get blitting parameters
int16 src_X = p->src_rect[1] - p->src_bounds[1];
int16 src_Y = p->src_rect[0] - p->src_bounds[0];
int16 dest_X = p->dest_rect[1] - p->dest_bounds[1];
int16 dest_Y = p->dest_rect[0] - p->dest_bounds[0];
int16 width = p->dest_rect[3] - p->dest_rect[1];
int16 height = p->dest_rect[2] - p->dest_rect[0];
D(bug(" src addr %08x, dest addr %08x\n", p->src_base_addr, p->dest_base_addr));
int16 src_X = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
int16 src_Y = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
D(bug(" width %d, height %d\n", width, height));
// And perform the blit
const int bpp = bytes_per_pixel(p->src_pixel_size);
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
width *= bpp;
if (p->src_row_bytes > 0) {
const int src_row_bytes = p->src_row_bytes;
const int dst_row_bytes = p->dest_row_bytes;
uint8 *src = (uint8 *)p->src_base_addr + (src_Y * src_row_bytes) + (src_X * bpp);
uint8 *dst = (uint8 *)p->dest_base_addr + (dest_Y * dst_row_bytes) + (dest_X * bpp);
if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
uint8 *src = (uint8 *)ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp);
uint8 *dst = (uint8 *)ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp);
for (int i = 0; i < height; i++) {
memcpy(dst, src, width);
src += src_row_bytes;
@ -1886,10 +1883,10 @@ void NQD_bitblt(uint32 arg)
}
}
else {
const int src_row_bytes = -p->src_row_bytes;
const int dst_row_bytes = -p->dest_row_bytes;
uint8 *src = (uint8 *)p->src_base_addr + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp);
uint8 *dst = (uint8 *)p->dest_base_addr + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp);
const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
uint8 *src = (uint8 *)ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp);
uint8 *dst = (uint8 *)ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp);
for (int i = height - 1; i >= 0; i--) {
memcpy(dst, src, width);
src -= src_row_bytes;
@ -1919,21 +1916,21 @@ void NQD_bitblt(uint32 arg)
50 : hilite
*/
bool NQD_bitblt_hook(uint32 arg)
bool NQD_bitblt_hook(uint32 p)
{
D(bug("accl_draw_hook %08x\n", arg));
accl_params *p = (accl_params *)arg;
D(bug("accl_draw_hook %08x\n", p));
// Check if we can accelerate this bitblt
if (((uint32 *)p)[0x18 >> 2] + ((uint32 *)p)[0x128 >> 2] == 0 &&
((uint32 *)p)[0x130 >> 2] == 0 &&
p->src_pixel_size >= 8 && p->src_pixel_size == p->dest_pixel_size &&
(p->src_row_bytes ^ p->dest_row_bytes) >= 0 && // same sign?
p->transfer_mode == 0 && // srcCopy?
((uint32 *)p)[0x15c >> 2] > 0) {
if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
ReadMacInt32(p + 0x130) == 0 &&
ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
ReadMacInt32(p + acclTransferMode) == 0 && // srcCopy?
ReadMacInt32(p + 0x15c) > 0) {
// Yes, set function pointer
p->draw_proc = NativeTVECT(NATIVE_BITBLT);
WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
return true;
}
return false;

27
SheepShaver/src/include/video_defs.h
View File

@ -22,6 +22,7 @@
#define VIDEO_DEFS_H
#include "macos_util.h"
#include <stddef.h>
/*
@ -360,6 +361,32 @@ struct accl_params {
// Argument for accl_sync_hook at offset 0x4f8
};
enum {
acclTransferMode = offsetof(accl_params, transfer_mode),
acclPenMode = offsetof(accl_params, pen_mode),
acclForePen = offsetof(accl_params, fore_pen),
acclBackPen = offsetof(accl_params, back_pen),
acclSrcBaseAddr = offsetof(accl_params, src_base_addr),
acclSrcRowBytes = offsetof(accl_params, src_row_bytes),
acclSrcBoundsRect = offsetof(accl_params, src_bounds),
acclSrcPixelType = offsetof(accl_params, src_pixel_type),
acclSrcPixelSize = offsetof(accl_params, src_pixel_size),
acclSrcCmpCount = offsetof(accl_params, src_cmp_count),
acclSrcCmpSize = offsetof(accl_params, src_cmp_size),
acclSrcPMTable = offsetof(accl_params, src_pm_table),
acclDestBaseAddr = offsetof(accl_params, dest_base_addr),
acclDestRowBytes = offsetof(accl_params, dest_row_bytes),
acclDestBoundsRect = offsetof(accl_params, dest_bounds),
acclDestPixelType = offsetof(accl_params, dest_pixel_type),
acclDestPixelSize = offsetof(accl_params, dest_pixel_size),
acclDestCmpCount = offsetof(accl_params, dest_cmp_count),
acclDestCmpSize = offsetof(accl_params, dest_cmp_size),
acclDestPMTable = offsetof(accl_params, dest_pm_table),
acclSrcRect = offsetof(accl_params, src_rect),
acclDestRect = offsetof(accl_params, dest_rect),
acclDrawProc = offsetof(accl_params, draw_proc)
};
// Hook info for NQDMisc
struct accl_hook_info {
uint32 draw_func;

12
SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp
View File

@ -985,6 +985,12 @@ static void NativeOp(int selector)
case NATIVE_ETHER_RSRV:
GPR(3) = ether_rsrv((queue_t *)GPR(3));
break;
#else
case NATIVE_ETHER_INIT:
// FIXME: needs more complicated thunks
GPR(3) = false;
break;
#endif
case NATIVE_SYNC_HOOK:
GPR(3) = NQD_sync_hook(GPR(3));
break;
@ -1003,12 +1009,6 @@ static void NativeOp(int selector)
case NATIVE_FILLRECT:
NQD_fillrect(GPR(3));
break;
#else
case NATIVE_ETHER_INIT:
// FIXME: needs more complicated thunks
GPR(3) = false;
break;
#endif
case NATIVE_SERIAL_NOTHING:
case NATIVE_SERIAL_OPEN:
case NATIVE_SERIAL_PRIME_IN: