aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gui/newgui.cpp21
-rw-r--r--queen/display.cpp35
-rw-r--r--scumm/costume.cpp26
-rw-r--r--scumm/gfx.cpp48
-rw-r--r--sky/disk.cpp22
-rw-r--r--sound/fmopl.cpp41
6 files changed, 2 insertions, 191 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 43782ef080..2cc3e6f054 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -24,11 +24,6 @@
#include "gui/newgui.h"
#include "gui/dialog.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
DECLARE_SINGLETON(GUI::NewGui);
namespace GUI {
@@ -125,6 +120,7 @@ void NewGui::runLoop() {
// This is necessary to get the blending right.
_system->clearOverlay();
_system->grabOverlay((OverlayColor *)_screen.pixels, _screenPitch);
+
for (int i = 0; i < _dialogStack.size(); i++) {
// For each dialog we draw we have to ensure the correct
// scaling mode is active.
@@ -222,7 +218,6 @@ void NewGui::runLoop() {
#pragma mark -
void NewGui::saveState() {
-
// Backup old cursor
_oldCursorMode = _system->showMouse(true);
@@ -407,20 +402,6 @@ void NewGui::blendRect(int x, int y, int w, int h, OverlayColor color, int level
h = rect.height();
w = rect.width();
-#ifdef PALMOS_68K
- ARM_START(BlendRectType)
- ARM_INIT(COMMON_BLENDRECT)
- ARM_ADDM(w)
- ARM_ADDM(h)
- ARM_ADDM(ptr)
- ARM_ADDM(_screenPitch)
- ARM_ADDM(r)
- ARM_ADDM(g)
- ARM_ADDM(b)
- ARM_ADDM(level)
- ARM_CALL(ARM_COMMON, PNO_DATA())
- ARM_END()
-#endif
while (h--) {
for (int i = 0; i < w; i++) {
_system->colorToRGB(ptr[i], ar, ag, ab);
diff --git a/queen/display.cpp b/queen/display.cpp
index 7eb19d43e0..1f65fb14cd 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -28,11 +28,6 @@
#include "queen/queen.h"
#include "queen/resource.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Queen {
#ifdef PALMOS_68K
@@ -569,19 +564,6 @@ void Display::prepareUpdate() {
uint8 *dst = _screenBuf;
const uint8 *src = _backdropBuf + _horizontalScroll;
-#ifdef PALMOS_68K
- ARM_START(CopyRectangleType)
- ARM_INIT(COMMON_COPYRECT)
- ARM_ADDM(dst)
- ARM_ADDV(buf, src)
- ARM_ADDV(pitch, BACKDROP_W)
- ARM_ADDV(_offScreenPitch, SCREEN_W)
- ARM_ADDV(w, SCREEN_W)
- ARM_ADDM(h)
- ARM_CALL(ARM_COMMON, PNO_DATA())
- ARM_END()
-#endif
-
while (h--) {
memcpy(dst, src, SCREEN_W);
dst += SCREEN_W;
@@ -696,23 +678,6 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin
assert(w <= dstPitch);
dstBuf += dstPitch * y + x;
-#ifdef PALMOS_68K
- ARM_CHECK_EXEC(w > 8 && h > 8)
- ARM_START(BlitType)
- ARM_INIT(QUEEN_BLIT)
- ARM_ADDM(dstBuf)
- ARM_ADDM(dstPitch)
- ARM_ADDM(srcBuf)
- ARM_ADDM(srcPitch)
- ARM_ADDM(w)
- ARM_ADDM(h)
- ARM_ADDM(xflip)
- ARM_ADDM(masked)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_END()
- ARM_CHECK_END()
-#endif
-
if (!masked) { // Unmasked always unflipped
while (h--) {
memcpy(dstBuf, srcBuf, w);
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 4d9f76cafc..e8767fab77 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -27,11 +27,6 @@
#include "scumm/sound.h"
#include "scumm/util.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Scumm {
#ifdef PALMOS_68K
@@ -414,27 +409,6 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) {
#undef MASK_AT
void ClassicCostumeRenderer::proc3(Codec1 &v1) {
-#ifdef PALMOS_68K
- ARM_START(CostumeProc3Type)
- ARM_INIT(SCUMM_PROC3)
- ARM_ADDP(v1)
- ARM_ADDM(_srcptr)
- ARM_ADDM(_height)
- ARM_ADDM(_scaleIndexX)
- ARM_ADDM(_scaleIndexY)
- ARM_ADDM(_scaleX)
- ARM_ADDM(_scaleY)
- ARM_ADDM(_numStrips)
- ARM_ADDM(_shadow_mode)
- ARM_ADDM(_shadow_table)
- ARM_ADDM(_palette)
- ARM_ADDV(_out_pitch, _out.pitch)
- ARM_ADDV(_out_w, _out.w)
- ARM_ADDV(_out_h, _out.h)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), _scaleIndexX)
- ARM_END()
-#endif
-
const byte *mask, *src;
byte *dst;
byte len, maskbit;
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 57d2748ec3..6ce482a669 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -29,11 +29,6 @@
#include "scumm/usage_bits.h"
#include "scumm/wiz_he.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Scumm {
static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, int h);
@@ -542,20 +537,6 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
byte *dst = _compositeBuf + x + y * _screenWidth;
const byte *text = (byte *)_charset->_textSurface.pixels + x + y * _charset->_textSurface.pitch;
-#ifdef PALMOS_68K
- ARM_START(DrawStripType)
- ARM_INIT(SCUMM_DRAWSTRIP)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_ADDM(src)
- ARM_ADDM(dst)
- ARM_ADDM(text)
- ARM_ADDV(_vm_screenWidth, _screenWidth)
- ARM_ADDV(vs_pitch, vs->pitch)
- ARM_ADDV(_charset_textSurface_pitch, _charset->_textSurface.pitch)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_CONTINUE()
-#endif
// Compose the text over the game graphics
for (int h = 0; h < height; ++h) {
for (int w = 0; w < width; ++w) {
@@ -606,20 +587,6 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
// Odd lines have colors swapped, so there will be checkered patterns.
// But apparently there is a mistake for 10th color.
void ScummEngine::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, int height) const {
-#ifdef PALMOS_68K
- ARM_START(RenderCGAType)
- ARM_INIT(SCUMM_RENDERCGA)
- ARM_ADDM(dst)
- ARM_ADDM(dstPitch)
- ARM_ADDM(x)
- ARM_ADDM(y)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_ADDV(_version, _version)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_END()
-#endif
-
byte *ptr;
int idx1, idx2;
static const byte cgaDither[2][2][16] = {
@@ -654,20 +621,6 @@ void ScummEngine::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, in
// cccc1
// dddd0
void ScummEngine::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const {
-#ifdef PALMOS_68K
- ARM_START(RenderHercType)
- ARM_INIT(SCUMM_RENDERHERC)
- ARM_ADDM(src)
- ARM_ADDM(hercbuf)
- ARM_ADDM(srcPitch)
- ARM_ADDM(x)
- ARM_ADDM(y)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_END()
-#endif
-
byte *srcptr, *dstptr;
int xo = *x, yo = *y, widtho = *width, heighto = *height;
int idx1, idx2, dsty = 0, y1;
@@ -3289,4 +3242,3 @@ _GRELEASEPTR(GBVARS_TRANSITIONEFFECTS_INDEX, GBVARS_SCUMM)
_GEND
#endif
-
diff --git a/sky/disk.cpp b/sky/disk.cpp
index 005a122f16..22091cc72b 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -28,11 +28,6 @@
#include "sky/sky.h"
#include "sky/struc.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Sky {
static const char *dataFilename = "sky.dsk";
@@ -164,14 +159,6 @@ uint8 *Disk::loadFile(uint16 fileNr) {
if ((fileFlags >> 22) & 0x1) { //do we include the header?
// don't return the file's header
output = uncompDest;
-#ifdef PALMOS_68K
- ARM_START(RncDecoderType)
- ARM_INIT(SKY_UNPACKM1)
- ARM_ADDM(input)
- ARM_ADDM(output)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), unpackLen)
- ARM_CONTINUE()
-#endif
unpackLen = _rncDecoder.unpackM1(input, output, 0);
} else {
#ifdef SCUMM_BIG_ENDIAN
@@ -183,15 +170,6 @@ uint8 *Disk::loadFile(uint16 fileNr) {
memcpy(uncompDest, fileDest, sizeof(dataFileHeader));
output = uncompDest + sizeof(dataFileHeader);
-
-#ifdef PALMOS_68K
- ARM_START(RncDecoderType)
- ARM_INIT(SKY_UNPACKM1)
- ARM_ADDM(input)
- ARM_ADDM(output)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), unpackLen)
- ARM_CONTINUE()
-#endif
unpackLen = _rncDecoder.unpackM1(input, output, 0);
if (unpackLen)
unpackLen += sizeof(dataFileHeader);
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp
index fe19443aea..f095ccd675 100644
--- a/sound/fmopl.cpp
+++ b/sound/fmopl.cpp
@@ -38,11 +38,6 @@
#include "common/config-manager.h"
#endif
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
static Common::RandomSource oplRnd; /* OPL random number generator */
/* -------------------- preliminary define section --------------------- */
@@ -732,16 +727,6 @@ static void OPL_initalize(FM_OPL *OPL) {
/* ---------- write a OPL registers ---------- */
void OPLWriteReg(FM_OPL *OPL, int r, int v) {
-#ifdef PALMOS_68K
- ARM_START(OPLDriverType)
- ARM_INIT(COMMON_OPLWRITEREG)
- ARM_ADDM(OPL)
- ARM_ADDM(r)
- ARM_ADDM(v)
- ARM_CALL(ARM_COMMON, PNO_DATA())
- ARM_END();
-#endif
-
OPL_CH *CH;
int slot;
uint block_fnum;
@@ -964,16 +949,6 @@ static void OPL_UnLockTable(void) {
/* ---------- update one of chip ----------- */
void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length) {
-#ifdef PALMOS_68K
- ARM_START(OPLDriverType)
- ARM_INIT(COMMON_YM3812YPDATEONE)
- ARM_ADDM(OPL)
- ARM_ADDM(buffer)
- ARM_ADDM(length)
- ARM_CALL(ARM_COMMON, PNO_DATA())
- ARM_END();
-#endif
-
int i;
int data;
int16 *buf = buffer;
@@ -1167,7 +1142,7 @@ FM_OPL *makeAdlibOPL(int rate) {
// We need to emulate one YM3812 chip
int env_bits = FMOPL_ENV_BITS_HQ;
int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_ARM) || defined(__GP32__)
+#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__)
if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
env_bits = FMOPL_ENV_BITS_HQ;
eg_ent = FMOPL_EG_ENT_HQ;
@@ -1183,20 +1158,6 @@ FM_OPL *makeAdlibOPL(int rate) {
}
#endif
-#ifdef PALMOS_68K
- // HQ is really unstable on PalmOS (at least on ARM),
- // don't know why... seems to read out of buffer ...
- env_bits = FMOPL_ENV_BITS_MQ;
- eg_ent = FMOPL_EG_ENT_MQ;
-
- ARM_START(OPLDriverType)
- ARM_INIT(COMMON_OPLCREATE)
- ARM_ADDM(env_bits)
- ARM_ADDM(eg_ent)
- ARM_ADDM(rate)
- ARM_CALL_RET(ARM_COMMON, PNO_DATA())
- ARM_END_RET(FM_OPL *);
-#endif
OPLBuildTables(env_bits, eg_ent);
return OPLCreate(OPL_TYPE_YM3812, 3579545, rate);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-17 12:50:20 +0000