ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Fix all warnings in src/gba/bios.cpp 

This adds some helper methods to safely downcast integer types.

Bug: #1003
This commit is contained in:
Fabrice de Gans 2022-09-25 18:40:45 -07:00 committed by Rafael Kitover
parent 1e1451c57f
commit 1d4eb48a68
3 changed files with 132 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/Port.h
View File

@ -13,18 +13,6 @@
#include <ppcintrinsics.h> #include <ppcintrinsics.h>
#endif #endif
// swaps a 16-bit value
static inline uint16_t swap16(uint16_t v)
{
return (v << 8) | (v >> 8);
}
// swaps a 32-bit value
static inline uint32_t swap32(uint32_t v)
{
return (v << 24) | ((v << 8) & 0xff0000) | ((v >> 8) & 0xff00) | (v >> 24);
}
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#if defined(__GNUC__) && defined(__ppc__) #if defined(__GNUC__) && defined(__ppc__)
@ -47,6 +35,19 @@ static inline uint32_t swap32(uint32_t v)
#define WRITE32LE(base, value) __asm__("stwbrx %0, 0, %1" : : "r"(value), "r"(base) : "memory") #define WRITE32LE(base, value) __asm__("stwbrx %0, 0, %1" : : "r"(value), "r"(base) : "memory")
#else #else
// swaps a 16-bit value
static inline uint16_t swap16(uint16_t v)
{
return (v << 8) | (v >> 8);
}
// swaps a 32-bit value
static inline uint32_t swap32(uint32_t v)
{
return (v << 24) | ((v << 8) & 0xff0000) | ((v >> 8) & 0xff00) | (v >> 24);
}
#define READ16LE(x) swap16(*((uint16_t *)(x))) #define READ16LE(x) swap16(*((uint16_t *)(x)))
#define READ32LE(x) swap32(*((uint32_t *)(x))) #define READ32LE(x) swap32(*((uint32_t *)(x)))
#define WRITE16LE(x, v) *((uint16_t *)x) = swap16((v)) #define WRITE16LE(x, v) *((uint16_t *)x) = swap16((v))

37
src/gba/GBAinline.h
View File

@ -1,6 +1,8 @@
#ifndef GBAINLINE_H #ifndef GBAINLINE_H
#define GBAINLINE_H #define GBAINLINE_H
#include <type_traits>
#include "../System.h" #include "../System.h"
#include "../common/Port.h" #include "../common/Port.h"
#include "GBALink.h" #include "GBALink.h"
@ -9,6 +11,7 @@
#include "Sound.h" #include "Sound.h"
#include "agbprint.h" #include "agbprint.h"
#include "remote.h" #include "remote.h"
#include "stdint.h"
extern const uint32_t objTilesAddress[3]; extern const uint32_t objTilesAddress[3];
@ -44,6 +47,28 @@ extern int cpuTotalTicks;
#define CPUReadMemoryQuick(addr) \ #define CPUReadMemoryQuick(addr) \
READ32LE(((uint32_t*)&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask])) READ32LE(((uint32_t*)&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]))
static inline uint16_t DowncastU16(uint32_t value) {
return static_cast<uint16_t>(value);
}
static inline int16_t Downcast16(int32_t value) {
return static_cast<int16_t>(value);
}
template<typename T>
static inline uint8_t DowncastU8(T value) {
static_assert(std::is_integral<T>::value, "Integral type required.");
static_assert(sizeof(T) ==2 || sizeof(T) == 4, "16 or 32 bits int required");
return static_cast<uint8_t>(value);
}
template<typename T>
static inline int8_t Downcast8(T value) {
static_assert(std::is_integral<T>::value, "Integral type required.");
static_assert(sizeof(T) ==2 || sizeof(T) == 4, "16 or 32 bits int required");
return static_cast<int8_t>(value);
}
extern uint32_t myROM[]; extern uint32_t myROM[];
static inline uint32_t CPUReadMemory(uint32_t address) static inline uint32_t CPUReadMemory(uint32_t address)
@ -390,7 +415,7 @@ static inline uint8_t CPUReadByte(uint32_t address)
return rom[address & 0x1FFFFFF]; return rom[address & 0x1FFFFFF];
case 13: case 13:
if (cpuEEPROMEnabled) if (cpuEEPROMEnabled)
return eepromRead(address); return DowncastU8(eepromRead(address));
goto unreadable; goto unreadable;
case 14: case 14:
case 15: case 15:
@ -399,13 +424,13 @@ static inline uint8_t CPUReadByte(uint32_t address)
switch (address & 0x00008f00) { switch (address & 0x00008f00) {
case 0x8200: case 0x8200:
return systemGetSensorX() & 255; return DowncastU8(systemGetSensorX());
case 0x8300: case 0x8300:
return (systemGetSensorX() >> 8) | 0x80; return DowncastU8((systemGetSensorX() >> 8) | 0x80);
case 0x8400: case 0x8400:
return systemGetSensorY() & 255; return DowncastU8(systemGetSensorY());
case 0x8500: case 0x8500:
return systemGetSensorY() >> 8; return DowncastU8(systemGetSensorY() >> 8);
} }
// default // default
default: default:
@ -508,7 +533,7 @@ static inline void CPUWriteMemory(uint32_t address, uint32_t value)
break; break;
case 0x0D: case 0x0D:
if (cpuEEPROMEnabled) { if (cpuEEPROMEnabled) {
eepromWrite(address, value); eepromWrite(address, DowncastU8(value));
break; break;
} }
goto unwritable; goto unwritable;

176
src/gba/bios.cpp
View File

@ -7,39 +7,39 @@
#include "Globals.h" #include "Globals.h"
#include "bios.h" #include "bios.h"
int16_t sineTable[256] = { uint16_t sineTable[256] = {
(int16_t)0x0000, (int16_t)0x0192, (int16_t)0x0323, (int16_t)0x04B5, (int16_t)0x0645, (int16_t)0x07D5, (int16_t)0x0964, (int16_t)0x0AF1, (uint16_t)0x0000, (uint16_t)0x0192, (uint16_t)0x0323, (uint16_t)0x04B5, (uint16_t)0x0645, (uint16_t)0x07D5, (uint16_t)0x0964, (uint16_t)0x0AF1,
(int16_t)0x0C7C, (int16_t)0x0E05, (int16_t)0x0F8C, (int16_t)0x1111, (int16_t)0x1294, (int16_t)0x1413, (int16_t)0x158F, (int16_t)0x1708, (uint16_t)0x0C7C, (uint16_t)0x0E05, (uint16_t)0x0F8C, (uint16_t)0x1111, (uint16_t)0x1294, (uint16_t)0x1413, (uint16_t)0x158F, (uint16_t)0x1708,
(int16_t)0x187D, (int16_t)0x19EF, (int16_t)0x1B5D, (int16_t)0x1CC6, (int16_t)0x1E2B, (int16_t)0x1F8B, (int16_t)0x20E7, (int16_t)0x223D, (uint16_t)0x187D, (uint16_t)0x19EF, (uint16_t)0x1B5D, (uint16_t)0x1CC6, (uint16_t)0x1E2B, (uint16_t)0x1F8B, (uint16_t)0x20E7, (uint16_t)0x223D,
(int16_t)0x238E, (int16_t)0x24DA, (int16_t)0x261F, (int16_t)0x275F, (int16_t)0x2899, (int16_t)0x29CD, (int16_t)0x2AFA, (int16_t)0x2C21, (uint16_t)0x238E, (uint16_t)0x24DA, (uint16_t)0x261F, (uint16_t)0x275F, (uint16_t)0x2899, (uint16_t)0x29CD, (uint16_t)0x2AFA, (uint16_t)0x2C21,
(int16_t)0x2D41, (int16_t)0x2E5A, (int16_t)0x2F6B, (int16_t)0x3076, (int16_t)0x3179, (int16_t)0x3274, (int16_t)0x3367, (int16_t)0x3453, (uint16_t)0x2D41, (uint16_t)0x2E5A, (uint16_t)0x2F6B, (uint16_t)0x3076, (uint16_t)0x3179, (uint16_t)0x3274, (uint16_t)0x3367, (uint16_t)0x3453,
(int16_t)0x3536, (int16_t)0x3612, (int16_t)0x36E5, (int16_t)0x37AF, (int16_t)0x3871, (int16_t)0x392A, (int16_t)0x39DA, (int16_t)0x3A82, (uint16_t)0x3536, (uint16_t)0x3612, (uint16_t)0x36E5, (uint16_t)0x37AF, (uint16_t)0x3871, (uint16_t)0x392A, (uint16_t)0x39DA, (uint16_t)0x3A82,
(int16_t)0x3B20, (int16_t)0x3BB6, (int16_t)0x3C42, (int16_t)0x3CC5, (int16_t)0x3D3E, (int16_t)0x3DAE, (int16_t)0x3E14, (int16_t)0x3E71, (uint16_t)0x3B20, (uint16_t)0x3BB6, (uint16_t)0x3C42, (uint16_t)0x3CC5, (uint16_t)0x3D3E, (uint16_t)0x3DAE, (uint16_t)0x3E14, (uint16_t)0x3E71,
(int16_t)0x3EC5, (int16_t)0x3F0E, (int16_t)0x3F4E, (int16_t)0x3F84, (int16_t)0x3FB1, (int16_t)0x3FD3, (int16_t)0x3FEC, (int16_t)0x3FFB, (uint16_t)0x3EC5, (uint16_t)0x3F0E, (uint16_t)0x3F4E, (uint16_t)0x3F84, (uint16_t)0x3FB1, (uint16_t)0x3FD3, (uint16_t)0x3FEC, (uint16_t)0x3FFB,
(int16_t)0x4000, (int16_t)0x3FFB, (int16_t)0x3FEC, (int16_t)0x3FD3, (int16_t)0x3FB1, (int16_t)0x3F84, (int16_t)0x3F4E, (int16_t)0x3F0E, (uint16_t)0x4000, (uint16_t)0x3FFB, (uint16_t)0x3FEC, (uint16_t)0x3FD3, (uint16_t)0x3FB1, (uint16_t)0x3F84, (uint16_t)0x3F4E, (uint16_t)0x3F0E,
(int16_t)0x3EC5, (int16_t)0x3E71, (int16_t)0x3E14, (int16_t)0x3DAE, (int16_t)0x3D3E, (int16_t)0x3CC5, (int16_t)0x3C42, (int16_t)0x3BB6, (uint16_t)0x3EC5, (uint16_t)0x3E71, (uint16_t)0x3E14, (uint16_t)0x3DAE, (uint16_t)0x3D3E, (uint16_t)0x3CC5, (uint16_t)0x3C42, (uint16_t)0x3BB6,
(int16_t)0x3B20, (int16_t)0x3A82, (int16_t)0x39DA, (int16_t)0x392A, (int16_t)0x3871, (int16_t)0x37AF, (int16_t)0x36E5, (int16_t)0x3612, (uint16_t)0x3B20, (uint16_t)0x3A82, (uint16_t)0x39DA, (uint16_t)0x392A, (uint16_t)0x3871, (uint16_t)0x37AF, (uint16_t)0x36E5, (uint16_t)0x3612,
(int16_t)0x3536, (int16_t)0x3453, (int16_t)0x3367, (int16_t)0x3274, (int16_t)0x3179, (int16_t)0x3076, (int16_t)0x2F6B, (int16_t)0x2E5A, (uint16_t)0x3536, (uint16_t)0x3453, (uint16_t)0x3367, (uint16_t)0x3274, (uint16_t)0x3179, (uint16_t)0x3076, (uint16_t)0x2F6B, (uint16_t)0x2E5A,
(int16_t)0x2D41, (int16_t)0x2C21, (int16_t)0x2AFA, (int16_t)0x29CD, (int16_t)0x2899, (int16_t)0x275F, (int16_t)0x261F, (int16_t)0x24DA, (uint16_t)0x2D41, (uint16_t)0x2C21, (uint16_t)0x2AFA, (uint16_t)0x29CD, (uint16_t)0x2899, (uint16_t)0x275F, (uint16_t)0x261F, (uint16_t)0x24DA,
(int16_t)0x238E, (int16_t)0x223D, (int16_t)0x20E7, (int16_t)0x1F8B, (int16_t)0x1E2B, (int16_t)0x1CC6, (int16_t)0x1B5D, (int16_t)0x19EF, (uint16_t)0x238E, (uint16_t)0x223D, (uint16_t)0x20E7, (uint16_t)0x1F8B, (uint16_t)0x1E2B, (uint16_t)0x1CC6, (uint16_t)0x1B5D, (uint16_t)0x19EF,
(int16_t)0x187D, (int16_t)0x1708, (int16_t)0x158F, (int16_t)0x1413, (int16_t)0x1294, (int16_t)0x1111, (int16_t)0x0F8C, (int16_t)0x0E05, (uint16_t)0x187D, (uint16_t)0x1708, (uint16_t)0x158F, (uint16_t)0x1413, (uint16_t)0x1294, (uint16_t)0x1111, (uint16_t)0x0F8C, (uint16_t)0x0E05,
(int16_t)0x0C7C, (int16_t)0x0AF1, (int16_t)0x0964, (int16_t)0x07D5, (int16_t)0x0645, (int16_t)0x04B5, (int16_t)0x0323, (int16_t)0x0192, (uint16_t)0x0C7C, (uint16_t)0x0AF1, (uint16_t)0x0964, (uint16_t)0x07D5, (uint16_t)0x0645, (uint16_t)0x04B5, (uint16_t)0x0323, (uint16_t)0x0192,
(int16_t)0x0000, (int16_t)0xFE6E, (int16_t)0xFCDD, (int16_t)0xFB4B, (int16_t)0xF9BB, (int16_t)0xF82B, (int16_t)0xF69C, (int16_t)0xF50F, (uint16_t)0x0000, (uint16_t)0xFE6E, (uint16_t)0xFCDD, (uint16_t)0xFB4B, (uint16_t)0xF9BB, (uint16_t)0xF82B, (uint16_t)0xF69C, (uint16_t)0xF50F,
(int16_t)0xF384, (int16_t)0xF1FB, (int16_t)0xF074, (int16_t)0xEEEF, (int16_t)0xED6C, (int16_t)0xEBED, (int16_t)0xEA71, (int16_t)0xE8F8, (uint16_t)0xF384, (uint16_t)0xF1FB, (uint16_t)0xF074, (uint16_t)0xEEEF, (uint16_t)0xED6C, (uint16_t)0xEBED, (uint16_t)0xEA71, (uint16_t)0xE8F8,
(int16_t)0xE783, (int16_t)0xE611, (int16_t)0xE4A3, (int16_t)0xE33A, (int16_t)0xE1D5, (int16_t)0xE075, (int16_t)0xDF19, (int16_t)0xDDC3, (uint16_t)0xE783, (uint16_t)0xE611, (uint16_t)0xE4A3, (uint16_t)0xE33A, (uint16_t)0xE1D5, (uint16_t)0xE075, (uint16_t)0xDF19, (uint16_t)0xDDC3,
(int16_t)0xDC72, (int16_t)0xDB26, (int16_t)0xD9E1, (int16_t)0xD8A1, (int16_t)0xD767, (int16_t)0xD633, (int16_t)0xD506, (int16_t)0xD3DF, (uint16_t)0xDC72, (uint16_t)0xDB26, (uint16_t)0xD9E1, (uint16_t)0xD8A1, (uint16_t)0xD767, (uint16_t)0xD633, (uint16_t)0xD506, (uint16_t)0xD3DF,
(int16_t)0xD2BF, (int16_t)0xD1A6, (int16_t)0xD095, (int16_t)0xCF8A, (int16_t)0xCE87, (int16_t)0xCD8C, (int16_t)0xCC99, (int16_t)0xCBAD, (uint16_t)0xD2BF, (uint16_t)0xD1A6, (uint16_t)0xD095, (uint16_t)0xCF8A, (uint16_t)0xCE87, (uint16_t)0xCD8C, (uint16_t)0xCC99, (uint16_t)0xCBAD,
(int16_t)0xCACA, (int16_t)0xC9EE, (int16_t)0xC91B, (int16_t)0xC851, (int16_t)0xC78F, (int16_t)0xC6D6, (int16_t)0xC626, (int16_t)0xC57E, (uint16_t)0xCACA, (uint16_t)0xC9EE, (uint16_t)0xC91B, (uint16_t)0xC851, (uint16_t)0xC78F, (uint16_t)0xC6D6, (uint16_t)0xC626, (uint16_t)0xC57E,
(int16_t)0xC4E0, (int16_t)0xC44A, (int16_t)0xC3BE, (int16_t)0xC33B, (int16_t)0xC2C2, (int16_t)0xC252, (int16_t)0xC1EC, (int16_t)0xC18F, (uint16_t)0xC4E0, (uint16_t)0xC44A, (uint16_t)0xC3BE, (uint16_t)0xC33B, (uint16_t)0xC2C2, (uint16_t)0xC252, (uint16_t)0xC1EC, (uint16_t)0xC18F,
(int16_t)0xC13B, (int16_t)0xC0F2, (int16_t)0xC0B2, (int16_t)0xC07C, (int16_t)0xC04F, (int16_t)0xC02D, (int16_t)0xC014, (int16_t)0xC005, (uint16_t)0xC13B, (uint16_t)0xC0F2, (uint16_t)0xC0B2, (uint16_t)0xC07C, (uint16_t)0xC04F, (uint16_t)0xC02D, (uint16_t)0xC014, (uint16_t)0xC005,
(int16_t)0xC000, (int16_t)0xC005, (int16_t)0xC014, (int16_t)0xC02D, (int16_t)0xC04F, (int16_t)0xC07C, (int16_t)0xC0B2, (int16_t)0xC0F2, (uint16_t)0xC000, (uint16_t)0xC005, (uint16_t)0xC014, (uint16_t)0xC02D, (uint16_t)0xC04F, (uint16_t)0xC07C, (uint16_t)0xC0B2, (uint16_t)0xC0F2,
(int16_t)0xC13B, (int16_t)0xC18F, (int16_t)0xC1EC, (int16_t)0xC252, (int16_t)0xC2C2, (int16_t)0xC33B, (int16_t)0xC3BE, (int16_t)0xC44A, (uint16_t)0xC13B, (uint16_t)0xC18F, (uint16_t)0xC1EC, (uint16_t)0xC252, (uint16_t)0xC2C2, (uint16_t)0xC33B, (uint16_t)0xC3BE, (uint16_t)0xC44A,
(int16_t)0xC4E0, (int16_t)0xC57E, (int16_t)0xC626, (int16_t)0xC6D6, (int16_t)0xC78F, (int16_t)0xC851, (int16_t)0xC91B, (int16_t)0xC9EE, (uint16_t)0xC4E0, (uint16_t)0xC57E, (uint16_t)0xC626, (uint16_t)0xC6D6, (uint16_t)0xC78F, (uint16_t)0xC851, (uint16_t)0xC91B, (uint16_t)0xC9EE,
(int16_t)0xCACA, (int16_t)0xCBAD, (int16_t)0xCC99, (int16_t)0xCD8C, (int16_t)0xCE87, (int16_t)0xCF8A, (int16_t)0xD095, (int16_t)0xD1A6, (uint16_t)0xCACA, (uint16_t)0xCBAD, (uint16_t)0xCC99, (uint16_t)0xCD8C, (uint16_t)0xCE87, (uint16_t)0xCF8A, (uint16_t)0xD095, (uint16_t)0xD1A6,
(int16_t)0xD2BF, (int16_t)0xD3DF, (int16_t)0xD506, (int16_t)0xD633, (int16_t)0xD767, (int16_t)0xD8A1, (int16_t)0xD9E1, (int16_t)0xDB26, (uint16_t)0xD2BF, (uint16_t)0xD3DF, (uint16_t)0xD506, (uint16_t)0xD633, (uint16_t)0xD767, (uint16_t)0xD8A1, (uint16_t)0xD9E1, (uint16_t)0xDB26,
(int16_t)0xDC72, (int16_t)0xDDC3, (int16_t)0xDF19, (int16_t)0xE075, (int16_t)0xE1D5, (int16_t)0xE33A, (int16_t)0xE4A3, (int16_t)0xE611, (uint16_t)0xDC72, (uint16_t)0xDDC3, (uint16_t)0xDF19, (uint16_t)0xE075, (uint16_t)0xE1D5, (uint16_t)0xE33A, (uint16_t)0xE4A3, (uint16_t)0xE611,
(int16_t)0xE783, (int16_t)0xE8F8, (int16_t)0xEA71, (int16_t)0xEBED, (int16_t)0xED6C, (int16_t)0xEEEF, (int16_t)0xF074, (int16_t)0xF1FB, (uint16_t)0xE783, (uint16_t)0xE8F8, (uint16_t)0xEA71, (uint16_t)0xEBED, (uint16_t)0xED6C, (uint16_t)0xEEEF, (uint16_t)0xF074, (uint16_t)0xF1FB,
(int16_t)0xF384, (int16_t)0xF50F, (int16_t)0xF69C, (int16_t)0xF82B, (int16_t)0xF9BB, (int16_t)0xFB4B, (int16_t)0xFCDD, (int16_t)0xFE6E (uint16_t)0xF384, (uint16_t)0xF50F, (uint16_t)0xF69C, (uint16_t)0xF82B, (uint16_t)0xF9BB, (uint16_t)0xFB4B, (uint16_t)0xFCDD, (uint16_t)0xFE6E
}; };
// 2020-08-12 - negativeExponent // 2020-08-12 - negativeExponent
@ -213,23 +213,23 @@ void BIOS_BgAffineSet()
src += 4; src += 4;
int32_t cy = CPUReadMemory(src); int32_t cy = CPUReadMemory(src);
src += 4; src += 4;
int16_t dispx = CPUReadHalfWord(src); int16_t dispx = CPUReadHalfWordSigned(src);
src += 2; src += 2;
int16_t dispy = CPUReadHalfWord(src); int16_t dispy = CPUReadHalfWordSigned(src);
src += 2; src += 2;
int16_t rx = CPUReadHalfWord(src); int16_t rx = CPUReadHalfWordSigned(src);
src += 2; src += 2;
int16_t ry = CPUReadHalfWord(src); int16_t ry = CPUReadHalfWordSigned(src);
src += 2; src += 2;
uint16_t theta = CPUReadHalfWord(src) >> 8; uint16_t theta = DowncastU16(CPUReadHalfWord(src) >> 8);
src += 4; // keep structure alignment src += 4; // keep structure alignment
int32_t a = sineTable[(theta + 0x40) & 255]; int32_t a = sineTable[(theta + 0x40) & 255];
int32_t b = sineTable[theta]; int32_t b = sineTable[theta];
int16_t dx = (rx * a) >> 14; int16_t dx = Downcast16((rx * a) >> 14);
int16_t dmx = (rx * b) >> 14; int16_t dmx = Downcast16((rx * b) >> 14);
int16_t dy = (ry * b) >> 14; int16_t dy = Downcast16((ry * b) >> 14);
int16_t dmy = (ry * a) >> 14; int16_t dmy = Downcast16((ry * a) >> 14);
CPUWriteHalfWord(dest, dx); CPUWriteHalfWord(dest, dx);
dest += 2; dest += 2;
@ -293,7 +293,7 @@ void BIOS_CpuSet()
} else { } else {
// 16-bit fill? // 16-bit fill?
if ((cnt >> 24) & 1) { if ((cnt >> 24) & 1) {
uint16_t value = (source > 0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source)); uint16_t value = (source > 0x0EFFFFFF ? 0x1CAD : DowncastU16(CPUReadHalfWord(source)));
while (count) { while (count) {
CPUWriteHalfWord(dest, value); CPUWriteHalfWord(dest, value);
dest += 2; dest += 2;
@ -302,7 +302,7 @@ void BIOS_CpuSet()
} else { } else {
// copy // copy
while (count) { while (count) {
CPUWriteHalfWord(dest, (source > 0x0EFFFFFF ? 0x1CAD : CPUReadHalfWord(source))); CPUWriteHalfWord(dest, (source > 0x0EFFFFFF ? 0x1CAD : DowncastU16(CPUReadHalfWord(source))));
source += 2; source += 2;
dest += 2; dest += 2;
count--; count--;
@ -452,14 +452,14 @@ void BIOS_Diff16bitUnFilter()
int len = header >> 8; int len = header >> 8;
uint16_t data = CPUReadHalfWord(source); uint16_t data = DowncastU16(CPUReadHalfWord(source));
source += 2; source += 2;
CPUWriteHalfWord(dest, data); CPUWriteHalfWord(dest, data);
dest += 2; dest += 2;
len -= 2; len -= 2;
while (len >= 2) { while (len >= 2) {
uint16_t diff = CPUReadHalfWord(source); uint16_t diff = DowncastU16(CPUReadHalfWord(source));
source += 2; source += 2;
data += diff; data += diff;
CPUWriteHalfWord(dest, data); CPUWriteHalfWord(dest, data);
@ -702,7 +702,7 @@ void BIOS_LZ77UnCompVram()
byteCount++; byteCount++;
if (byteCount == 2) { if (byteCount == 2) {
CPUWriteHalfWord(dest, writeValue); CPUWriteHalfWord(dest, DowncastU16(writeValue));
dest += 2; dest += 2;
byteCount = 0; byteCount = 0;
byteShift = 0; byteShift = 0;
@ -717,7 +717,7 @@ void BIOS_LZ77UnCompVram()
byteShift += 8; byteShift += 8;
byteCount++; byteCount++;
if (byteCount == 2) { if (byteCount == 2) {
CPUWriteHalfWord(dest, writeValue); CPUWriteHalfWord(dest, DowncastU16(writeValue));
dest += 2; dest += 2;
byteCount = 0; byteCount = 0;
byteShift = 0; byteShift = 0;
@ -735,7 +735,7 @@ void BIOS_LZ77UnCompVram()
byteShift += 8; byteShift += 8;
byteCount++; byteCount++;
if (byteCount == 2) { if (byteCount == 2) {
CPUWriteHalfWord(dest, writeValue); CPUWriteHalfWord(dest, DowncastU16(writeValue));
dest += 2; dest += 2;
byteShift = 0; byteShift = 0;
byteCount = 0; byteCount = 0;
@ -824,20 +824,20 @@ void BIOS_ObjAffineSet()
int offset = reg[3].I; int offset = reg[3].I;
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
int16_t rx = CPUReadHalfWord(src); int16_t rx = CPUReadHalfWordSigned(src);
src += 2; src += 2;
int16_t ry = CPUReadHalfWord(src); int16_t ry = CPUReadHalfWordSigned(src);
src += 2; src += 2;
uint16_t theta = CPUReadHalfWord(src) >> 8; uint16_t theta = DowncastU16(CPUReadHalfWord(src) >> 8);
src += 4; // keep structure alignment src += 4; // keep structure alignment
int32_t a = (int32_t)sineTable[(theta + 0x40) & 255]; int32_t a = (int32_t)sineTable[(theta + 0x40) & 255];
int32_t b = (int32_t)sineTable[theta]; int32_t b = (int32_t)sineTable[theta];
int16_t dx = ((int32_t)rx * a) >> 14; int16_t dx = Downcast16((((int32_t)rx * a) >> 14));
int16_t dmx = ((int32_t)rx * b) >> 14; int16_t dmx = Downcast16(((int32_t)rx * b) >> 14);
int16_t dy = ((int32_t)ry * b) >> 14; int16_t dy = Downcast16(((int32_t)ry * b) >> 14);
int16_t dmy = ((int32_t)ry * a) >> 14; int16_t dmy = Downcast16(((int32_t)ry * a) >> 14);
CPUWriteHalfWord(dest, dx); CPUWriteHalfWord(dest, dx);
dest += offset; dest += offset;
@ -976,7 +976,7 @@ void BIOS_RLUnCompVram()
byteCount++; byteCount++;
if (byteCount == 2) { if (byteCount == 2) {
CPUWriteHalfWord(dest, writeValue); CPUWriteHalfWord(dest, DowncastU16(writeValue));
dest += 2; dest += 2;
byteCount = 0; byteCount = 0;
byteShift = 0; byteShift = 0;
@ -993,7 +993,7 @@ void BIOS_RLUnCompVram()
byteShift += 8; byteShift += 8;
byteCount++; byteCount++;
if (byteCount == 2) { if (byteCount == 2) {
CPUWriteHalfWord(dest, writeValue); CPUWriteHalfWord(dest, DowncastU16(writeValue));
dest += 2; dest += 2;
byteCount = 0; byteCount = 0;
byteShift = 0; byteShift = 0;
@ -1215,23 +1215,23 @@ static int32_t BIOS_SndDriver_3e4(uint32_t const r0a, uint32_t const r1a) // 0x3
} while (!gtr); } while (!gtr);
while (1) { while (1) {
v5 += (r0 >= (uint32_t)r2) + v5; v5 += (r0 >= r2) + v5;
if (r0 >= (uint32_t)r2) if (r0 >= r2)
r0 -= r2; r0 -= r2;
if (r2 == r1) if (r2 == r1)
break; break;
r2 = (uint32_t)r2 >> 1; r2 >>= 1;
} }
if (!(r12 << 1)) if ((r12 << 1) == 0)
return -v5; return 0 - v5;
else else
return v5; return v5;
} }
static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a
{ {
uint8_t local1 = (p1 & 0x000F0000) >> 16; // param is r0 uint8_t local1 = DowncastU8((p1 & 0x000F0000) >> 16); // param is r0
uint32_t const puser1 = CPUReadMemory(0x3007FF0); // 7FC0 + 0x30 uint32_t const puser1 = CPUReadMemory(0x3007FF0); // 7FC0 + 0x30
// Store something // Store something
@ -1253,7 +1253,7 @@ static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a
// 0x172c // 0x172c
r0 = BIOS_SndDriver_3e4(r0, r1); r0 = BIOS_SndDriver_3e4(r0, r1);
CPUWriteByte(puser1 + 0xB, r0); CPUWriteByte(puser1 + 0xB, DowncastU8(r0));
uint32_t x = 0x91d1b * r4; uint32_t x = 0x91d1b * r4;
r1 = x + 0x1388; r1 = x + 0x1388;
@ -1273,12 +1273,12 @@ static void BIOS_SndDriverSub1(uint32_t p1) // 0x170a
CPUWriteHalfWord(r4basesnd + 2, 0); CPUWriteHalfWord(r4basesnd + 2, 0);
r0 = BIOS_SndDriver_3e4(r0, r1); r0 = BIOS_SndDriver_3e4(r0, r1);
r0 = (1 << 16) - r0; r0 = (1 << 16) - r0;
CPUWriteHalfWord(r4basesnd + 0, r0); CPUWriteHalfWord(r4basesnd + 0, DowncastU16(r0));
// sub 0x18c8 is unrolled here // sub 0x18c8 is unrolled here
r1 = 0x5b << 9; r1 = 0x5b << 9;
CPUWriteHalfWord(base1 + 6, r1); CPUWriteHalfWord(base1 + 6, DowncastU16(r1));
CPUWriteHalfWord(base1 + 12, r1); CPUWriteHalfWord(base1 + 12, DowncastU16(r1));
// 0x176a, @todo busy loop here // 0x176a, @todo busy loop here
r0 = 0x4000000; r0 = 0x4000000;
@ -1314,7 +1314,7 @@ void BIOS_SndDriverInit() // 0x166a
CPUWriteHalfWord(base2 + 4, 0x8F); CPUWriteHalfWord(base2 + 4, 0x8F);
CPUWriteHalfWord(base2 + 2, 0xA90E); CPUWriteHalfWord(base2 + 2, 0xA90E);
uint16_t val9 = CPUReadHalfWord(base2 + 9); uint16_t val9 = DowncastU16(CPUReadHalfWord(base2 + 9));
CPUWriteHalfWord(base2 + 9, val9 & ADBITS_MASK); // DA? CPUWriteHalfWord(base2 + 9, val9 & ADBITS_MASK); // DA?
CPUWriteMemory(base3 + 0, (user1 + 0x350)); //0x350, 640int CPUWriteMemory(base3 + 0, (user1 + 0x350)); //0x350, 640int
@ -1381,7 +1381,7 @@ void BIOS_SndDriverMode() //0x179c
dab >>= 0xE; dab >>= 0xE;
uint8_t adv = CPUReadByte(puser1 + 9) & ADBITS_MASK; // @todo verify offset uint8_t adv = CPUReadByte(puser1 + 9) & ADBITS_MASK; // @todo verify offset
dab |= adv; dab |= adv;
CPUWriteByte(puser1 + 9, dab); CPUWriteByte(puser1 + 9, DowncastU8(dab));
} }
// Playback frequency at bits 16...19 // Playback frequency at bits 16...19
uint32_t pbf = (input & 0x000F0000); uint32_t pbf = (input & 0x000F0000);
@ -1488,8 +1488,8 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
//0x1ea2 //0x1ea2
uint32_t r4 = puser1; // apparenty ch ptr? uint32_t r4 = puser1; // apparenty ch ptr?
int r9 = CPUReadMemory(r4 + 0x14); uint32_t r9 = CPUReadMemory(r4 + 0x14);
int r12 = CPUReadMemory(r4 + 0x18); uint32_t r12 = CPUReadMemory(r4 + 0x18);
uint32_t i = CPUReadByte(r4 + 0x6); uint32_t i = CPUReadByte(r4 + 0x6);
for (r4 += 0x10; i > 0; i--) { for (r4 += 0x10; i > 0; i--) {
@ -1557,7 +1557,7 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
} }
{ {
//lbl_0x1f54: //lbl_0x1f54:
CPUWriteByte(r4 + 0x9, r5); CPUWriteByte(r4 + 0x9, DowncastU8(r5));
uint32_t user0 = CPUReadByte(puser1 + 0x7); // @sp+10 uint32_t user0 = CPUReadByte(puser1 + 0x7); // @sp+10
user0++; user0++;
@ -1567,12 +1567,12 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
user0 = CPUReadByte(r4 + 0x2); user0 = CPUReadByte(r4 + 0x2);
user0 *= r5; user0 *= r5;
user0 >>= 8; user0 >>= 8;
CPUWriteByte(r4 + 0xA, user0); CPUWriteByte(r4 + 0xA, DowncastU8(user0));
user0 = CPUReadByte(r4 + 0x3); user0 = CPUReadByte(r4 + 0x3);
user0 *= r5; user0 *= r5;
user0 >>= 8; user0 >>= 8;
CPUWriteByte(r4 + 0xB, user0); CPUWriteByte(r4 + 0xB, DowncastU8(user0));
user0 = r6 & 0x10; user0 = r6 & 0x10;
if (user0 != 0) // @todo 0x1f76 if (user0 != 0) // @todo 0x1f76
@ -1622,7 +1622,7 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
if (r2) { if (r2) {
r3 = CPUReadMemory(reg[13].I + 0xC); // @todo stack pull 0x205c r3 = CPUReadMemory(reg[13].I + 0xC); // @todo stack pull 0x205c
} else { } else {
CPUWriteByte(r4, r2); CPUWriteByte(r4, DowncastU8(r2));
goto lbl_20e4; goto lbl_20e4;
} }
} }
@ -1630,23 +1630,23 @@ void BIOS_SndDriverMain() // 0x1dc4 -> 0x08004024 phantasy star
} while (r7 >= r9); } while (r7 >= r9);
lbl_207c: lbl_207c:
while (1) { while (1) {
int32_t r0a = CPUReadByte(r3); int32_t r0b = CPUReadByte(DowncastU8(r3));
int32_t r1a = CPUReadByte(r3 + 0x1); int32_t r1a = CPUReadByte(r3 + 0x1);
r1a -= r0a; r1a -= r0b;
int32_t r6a = r1a * (int32_t)r7; int32_t r6a = r1a * (int32_t)r7;
r1a = r6a * r12; // 208c r1a = r6a * r12; // 208c
r6a = (r0a + ((int8_t)(r1a >> 23))); r6a = (r0b + ((int8_t)(r1a >> 23)));
r1a = r6a * (int32_t)r11; r1a = r6a * (int32_t)r11;
r0a = CPUReadByte(r5 + 0x630); r0b = CPUReadByte(r5 + 0x630);
r0a = (r0a + ((int8_t)(r1a >> 8))); r0b = (r0b + ((int8_t)(r1a >> 8)));
CPUWriteByte(r5 + 0x630, r0a); CPUWriteByte(r5 + 0x630, DowncastU8(r0b));
r1a = r6a * (int32_t)r10; r1a = r6a * (int32_t)r10;
r0a = CPUReadByte(r5); r0b = CPUReadByte(r5);
r0a = (r0a + ((int8_t)(r1a >> 8))); r0b = (r0b + ((int8_t)(r1a >> 8)));
CPUWriteByte(r5++, r0a); //ptr inc +1 not +4 CPUWriteByte(r5++, DowncastU8(r0b)); //ptr inc +1 not +4
r7 += r14; r7 += r14;
--r8; --r8;
@ -1681,13 +1681,13 @@ void BIOS_SndDriverVSync()
CPUWriteByte(puser1 + 4, v1i); CPUWriteByte(puser1 + 4, v1i);
if (v1 <= 1) { if (v1 <= 1) {
uint8_t v2 = CPUReadByte(puser1 + 0xB); //11 uint8_t v2 = CPUReadByte(puser1 + 0xB); //11
uint32_t base2 = 0x040000D2; uint32_t base3 = 0x040000D2;
CPUWriteByte(puser1 + 4, v2); CPUWriteByte(puser1 + 4, v2);
CPUWriteHalfWord(base1 + 0x6, 0); CPUWriteHalfWord(base1 + 0x6, 0);
CPUWriteHalfWord(base2, 0); CPUWriteHalfWord(base3, 0);
CPUWriteHalfWord(base1 + 0x6, 0xB600); CPUWriteHalfWord(base1 + 0x6, 0xB600);
CPUWriteHalfWord(base2, 0xB600); //-18944 CPUWriteHalfWord(base3, 0xB600); //-18944
} }
} }
} }