2016-01-07 08:14:33 +00:00
|
|
|
#pragma once
|
2011-09-29 12:08:22 +00:00
|
|
|
|
Update to v089r17 release.
byuu says:
This implements the spec from the XML part 3 thread:
http://board.byuu.org/viewtopic.php?f=16&t=2998
It's also propagated the changes to nall and purify, so you can test
this one.
This is basically it, after years of effort I feel I finally have
a fully consistent and logical XML board format.
The only things left to change will be: modifications if emulation turns
out to be incorrect (eg we missed some MMIO mirrors, or mirrored too
much), and new additions.
And of course, I'm giving it a bit of time for good arguments against
the format.
Other than that, this release removes linear_vector and pointer_vector,
as vector is better than linear_vector and I've never used
pointer_vector.
vector also gets move(), which is a way to use move-semantics across
types. It lets you steal the underlying memory pool, effectively
destroying the vector without a copy.
This works really nicely with the move for read() functions to return
vector<uint8> instead of taking (uint8_t*&, unsigned&) parameters.
2012-07-15 13:02:27 +00:00
|
|
|
#include <nall/stdint.hpp>
|
|
|
|
|
2011-09-29 12:08:22 +00:00
|
|
|
namespace nall {
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto binary_(const char* s, uintmax sum = 0) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
|
|
|
*s == '0' || *s == '1' ? binary_(s + 1, (sum << 1) | *s - '0') :
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
*s == '\'' ? binary_(s + 1, sum) :
|
2011-09-29 12:08:22 +00:00
|
|
|
sum
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto octal_(const char* s, uintmax sum = 0) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
|
|
|
*s >= '0' && *s <= '7' ? octal_(s + 1, (sum << 3) | *s - '0') :
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
*s == '\'' ? octal_(s + 1, sum) :
|
2011-09-29 12:08:22 +00:00
|
|
|
sum
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-16 08:38:05 +00:00
|
|
|
constexpr inline auto decimal_(const char* s, uintmax sum = 0) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s >= '0' && *s <= '9' ? decimal_(s + 1, (sum * 10) + *s - '0') :
|
|
|
|
*s == '\'' ? decimal_(s + 1, sum) :
|
2011-09-29 12:08:22 +00:00
|
|
|
sum
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto hex_(const char* s, uintmax sum = 0) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
|
|
|
*s >= 'A' && *s <= 'F' ? hex_(s + 1, (sum << 4) | *s - 'A' + 10) :
|
|
|
|
*s >= 'a' && *s <= 'f' ? hex_(s + 1, (sum << 4) | *s - 'a' + 10) :
|
|
|
|
*s >= '0' && *s <= '9' ? hex_(s + 1, (sum << 4) | *s - '0') :
|
Update to v093r02 release.
byuu says:
Changelog:
- nall: fixed major memory leak in string class
- ruby: video shaders support #define-based settings now
- phoenix/GTK+: support > 256x256 icons for window / task bar / alt-tab
- sfc: remove random/ and config/, merge into system/
- ethos: delete higan.png (48x48), replace with higan512.png (512x512)
as new higan.png
- ethos: default gamma to 100% (no color adjustment)
- ethos: use "Video Shaders/Display Emulation/" instead of "Video
Shaders/Emulation/"
- use g++ instead of g++-4.7 (g++ -v must be >= 4.7)
- use -std=c++11 instead of -std=gnu++11
- applied a few patches from Debian upstream to make their packaging job
easier
So because colors are normalized in GLSL, I won't be able to offer video
shaders absolute color literals. We will have to perform basic color
conversion inside the core.
As such, the current plan is to create some sort of Emulator::Settings
interface. With that, I'll connect an option for color correction, which
will be on by default. For FC/SFC, that will mean gamma correction
(darker / stronger colors), and for GB/GBC/GBA, it will mean simulating
the weird brightness levels of the displays. I am undecided on whether
to use pea soup green for the GB or not. By not doing so, it'll be
easier for the display emulation shader to do it.
2013-11-09 11:45:54 +00:00
|
|
|
*s == '\'' ? hex_(s + 1, sum) :
|
2011-09-29 12:08:22 +00:00
|
|
|
sum
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto binary(const char* s) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s == '0' && (*(s + 1) == 'B' || *(s + 1) == 'b') ? binary_(s + 2) :
|
|
|
|
*s == '%' ? binary_(s + 1) : binary_(s)
|
2011-09-29 12:08:22 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto octal(const char* s) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s == '0' && (*(s + 1) == 'O' || *(s + 1) == 'o') ? octal_(s + 2) :
|
2011-09-29 12:08:22 +00:00
|
|
|
octal_(s)
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-16 08:38:05 +00:00
|
|
|
constexpr inline auto hex(const char* s) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s == '0' && (*(s + 1) == 'X' || *(s + 1) == 'x') ? hex_(s + 2) :
|
|
|
|
*s == '$' ? hex_(s + 1) : hex_(s)
|
2011-09-29 12:08:22 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-16 08:38:05 +00:00
|
|
|
//
|
|
|
|
|
2015-11-14 00:52:51 +00:00
|
|
|
constexpr inline auto natural(const char* s) -> uintmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s == '0' && (*(s + 1) == 'B' || *(s + 1) == 'b') ? binary_(s + 2) :
|
|
|
|
*s == '0' && (*(s + 1) == 'O' || *(s + 1) == 'o') ? octal_(s + 2) :
|
|
|
|
*s == '0' && (*(s + 1) == 'X' || *(s + 1) == 'x') ? hex_(s + 2) :
|
|
|
|
*s == '%' ? binary_(s + 1) : *s == '$' ? hex_(s + 1) : decimal_(s)
|
2011-09-29 12:08:22 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-16 08:38:05 +00:00
|
|
|
constexpr inline auto integer(const char* s) -> intmax {
|
2011-09-29 12:08:22 +00:00
|
|
|
return (
|
2015-11-16 08:38:05 +00:00
|
|
|
*s == '+' ? +natural(s + 1) : *s == '-' ? -natural(s + 1) : natural(s)
|
2011-09-29 12:08:22 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2015-11-16 08:38:05 +00:00
|
|
|
//
|
|
|
|
|
2015-07-14 09:32:43 +00:00
|
|
|
inline auto real(const char* s) -> double {
|
2011-09-29 12:08:22 +00:00
|
|
|
return atof(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|