jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Making ComplexBitMap a POD part 1

Browse Source
This commit is contained in:
jaby
2022-09-11 11:36:51 +02:00
parent 9cb0b70308
commit d30a975725
9 changed files with 386 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/PSX/System/IOPorts/DMA_IO.hpp
View File

@@ -58,27 +58,27 @@ namespace DMA {
static constexpr auto ToMainRAM = !FromMainRAM;
static constexpr CHCHR StartMDECin() {
return CHCHR(0x01000201);
return ComplexBitMap{0x01000201};
}
static constexpr CHCHR StartMDECout() {
return CHCHR(0x01000200);
return ComplexBitMap{0x01000200};
}
static constexpr CHCHR StartGPUReceive() {
return CHCHR(0x01000201);
return ComplexBitMap{0x01000201};
}
static constexpr CHCHR StartCDROM() {
return CHCHR(0x11000000);
return ComplexBitMap{0x11000000};
}
static constexpr CHCHR StartSPUReceive() {
return CHCHR(0x01000201);
return ComplexBitMap{0x01000201};
}
static constexpr CHCHR StartOTC() {
return CHCHR(0x11000002);
return ComplexBitMap{0x11000002};
}
};

12
include/PSX/System/IOPorts/GPU_IO.hpp
View File

@@ -46,16 +46,16 @@ namespace GPU {
struct __no_align GP0 : public ComplexBitMap<uint32_t> {
__io_port_inherit_complex_bit_map(GP0);
static constexpr GP0 QuickFill(Color color) {
return {(0x02 << 24) | color.raw()};
static constexpr GP0 QuickFill(Color24 color) {
return ComplexBitMap{(0x02 << 24) | color.raw()};
}
static constexpr GP0 TopLeftPosition(uint16_t x, uint16_t y) {
return {(y << 16) | x};
return ComplexBitMap{static_cast<uint16_t>((y << 16) | x)};
}
static constexpr GP0 WidthHeight(uint16_t w, uint16_t h) {
return {(h << 16) | w};
return ComplexBitMap{static_cast<uint16_t>((h << 16) | w)};
}
};
@@ -67,11 +67,11 @@ namespace GPU {
}
static constexpr GP1 Reset() {
return {0};
return ComplexBitMap{0};
}
static constexpr GP1 SetDisplayState(DisplayState state) {
return {construct_cmd(0x03, static_cast<uint32_t>(state))};
return ComplexBitMap{construct_cmd(0x03, static_cast<uint32_t>(state))};
}
};
}

230
include/PSX/System/IOPorts/IOPort.hpp
View File

@@ -1,205 +1,6 @@
#ifndef __JABYENGINE_IOPORT_HPP__
#define __JABYENGINE_IOPORT_HPP__
#include "../../Auxiliary/bits.hpp"
struct ClearBitValue {
size_t bit;
constexpr ClearBitValue(size_t bit) : bit(bit) {
}
};
template<typename T>
struct Bit {
typedef T ValueType;
size_t value;
constexpr Bit(size_t value) : value(value) {
}
constexpr operator size_t() const {
return this->value;
}
constexpr ClearBitValue operator!() const {
return ClearBitValue(this->value);
}
};
template<typename T>
struct BitRangeValue {
T value;
size_t begin;
size_t length;
};
template<typename T>
struct BitRange {
typedef T ValueType;
size_t begin;
size_t length;
static constexpr BitRange<T> from_to(size_t start, size_t end) {
return {start, (end - start + 1)};
}
constexpr BitRangeValue<T> with(T value) const {
return {value, this->begin, this->length};
}
};
template<typename T>
static constexpr __always_inline BitRangeValue<T> operator<<(const BitRange<T>& range, T value) {
return BitRangeValue{value, range.begin, range.length};
}
template<typename T>
class __no_align ComplexBitMap {
private:
T value = 0;
template<typename S>
constexpr ComplexBitMap<T>& set_va(const S& value) {
return this->set(value);
}
template<typename S, typename...ARGS>
constexpr ComplexBitMap<T>& set_va(const S& value, const ARGS&...args) {
return this->set_va(value).set_va(args...);
}
public:
constexpr ComplexBitMap() = default;
constexpr ComplexBitMap(T value) : value(value) {
}
template<typename...ARGS>
static constexpr ComplexBitMap<T> with(ARGS...args) {
return ComplexBitMap().set_va(args...);
}
//Accesssing bits
template<typename S>
constexpr ComplexBitMap<T>& set_bit(S bit) {
this->value = bit::set(this->value, static_cast<size_t>(bit));
return *this;
}
template<typename S>
constexpr void set_bit(S bit) volatile {
this->value = bit::set(this->value, static_cast<size_t>(bit));
}
template<typename S>
constexpr ComplexBitMap<T>& clear_bit(S bit) {
this->value = bit::clear(this->value, static_cast<size_t>(bit));
return *this;
}
template<typename S>
constexpr void clear_bit(S bit) volatile {
this->value = bit::clear(this->value, static_cast<size_t>(bit));
}
template<typename S>
constexpr bool is_bit_set(S bit) {
return bit::is_set(this->value, static_cast<size_t>(bit));
}
template<typename S>
constexpr bool is_bit_set(S bit) volatile {
return bit::is_set(this->value, static_cast<size_t>(bit));
}
//Accessing values
template<typename S>
constexpr ComplexBitMap<T>& set_value(S value, const BitRange<S>& range) {
this->value = bit::value::set_normalized(this->value, static_cast<T>(value), range.begin, range.length);
return *this;
}
template<typename S>
constexpr void set_value(S value, const BitRange<S>& range) volatile {
this->value = bit::value::set_normalized(this->value, static_cast<T>(value), range.begin, range.length);
}
template<typename S>
constexpr ComplexBitMap<T>& clear_value(const BitRange<S>& range) {
this->value = bit::value::clear_normalized(this->value, range.begin, range.length);
return *this;
}
template<typename S>
constexpr void clear_value(const BitRange<S>& range) volatile {
this->value = bit::value::clear_normalized(this->value, range.begin, range.length);
}
template<typename S>
constexpr S get_value(const BitRange<S>& range) {
return static_cast<S>(bit::value::get_normalized(this->value, range.begin, range.length));
}
template<typename S>
constexpr S get_value(const BitRange<S>& range) volatile {
return static_cast<S>(bit::value::get_normalized(this->value, range.begin, range.length));
}
// For easier constructing
constexpr ComplexBitMap<T>& set(const BitRange<T>& range, T value) {
this->set_value(value, range);
return *this;
}
constexpr ComplexBitMap<T>& set(const BitRangeValue<T>& value) {
this->set_value(value.value, {value.begin, value.length});
return *this;
}
constexpr ComplexBitMap<T>& set(const Bit<T>& bit) {
this->set_bit(bit.value);
return *this;
}
constexpr ComplexBitMap<T>& set(const ClearBitValue& value) {
this->clear_bit(value.bit);
return *this;
}
constexpr ComplexBitMap<T>& operator|(const BitRangeValue<T>& value) {
this->set_value(value.value, value.range);
return *this;
}
constexpr ComplexBitMap<T>& operator|(const Bit<T>& bit) {
this->set_bit(bit.value);
return *this;
}
constexpr ComplexBitMap<T>& operator|(const ClearBitValue& value) {
this->clear_bit(value.bit);
return *this;
}
//For raw access
constexpr operator T() const {
return this->value;
}
constexpr operator T() const volatile {
return this->value;
}
constexpr ComplexBitMap<T>& operator=(T value) {
this->value = value;
return *this;
}
constexpr void operator=(T value) volatile {
this->value = value;
}
};
#include "../../Auxiliary/complex_bitmap.hpp"
template<typename T>
class __no_align IOPort {
@@ -230,23 +31,23 @@ struct __no_align ubus32_t {
}
constexpr operator uint32_t() const {
return ((this->high << 16) | this->low);
return ((this->high.raw << 16) | this->low.raw);
}
constexpr operator uint32_t() const volatile {
return ((this->high << 16) | this->low);
operator uint32_t() const volatile {
return ((this->high.raw << 16) | this->low.raw);
}
constexpr ubus32_t& operator=(uint32_t value) {
this->low = (value & 0xFFFF);
this->high = (value >> 16);
this->low.raw = (value & 0xFFFF);
this->high.raw = (value >> 16);
return *this;
}
constexpr void operator=(uint32_t value) volatile {
this->low = (value & 0xFFFF);
this->high = (value >> 16);
this->low.raw = (value & 0xFFFF);
this->high.raw = (value >> 16);
}
};
static constexpr uintptr_t IO_Base_Mask = 0xF0000000;
@@ -257,12 +58,25 @@ static constexpr uintptr_t IO_Base_Adr = 0x10000000;
#define __declare_io_port_global_const(type, name, adr) __declare_io_port_global_raw(const, type, name, adr)
#define __declare_io_port_global_array(type, name, adr, size) static __always_inline auto& name = reinterpret_cast<type(&)[size]>(*reinterpret_cast<type*>((IO_Base_Adr + (adr & ~IO_Base_Mask))));
#define __io_port_inherit_complex_bit_map(name) \
constexpr name() = default; \
constexpr name(ComplexBitMap value) : ComplexBitMap(value) { \
} \
template<typename...ARGS> \
static constexpr name with(ARGS...args) { \
return {ComplexBitMap::with(args...)}; \
}\
template<typename T> \
constexpr void operator=(ComplexBitMap<T> value) volatile { \
this->raw = value.raw; \
}
/*\
using ComplexBitMap::operator=; \
constexpr name() = default; \
constexpr name(ComplexBitMap value) : ComplexBitMap(value) { \
}\
template<typename...ARGS> \
constexpr name(ARGS...args) : ComplexBitMap(args...) {\
}
}*/
#endif //!__JABYENGINE_IOPORT_HPP__

2
include/PSX/System/IOPorts/SPU_IO.hpp
View File

@@ -34,7 +34,7 @@ namespace SPU {
//4096 == 44100Hz
constexpr double Base = (4096.0 / 44100.0);
return ComplexBitMap(static_cast<uint16_t>((freq*Base)));
return ComplexBitMap<uint16_t>{static_cast<uint16_t>((freq*Base))};
}
};