Squashed 'external/ircolib/' changes from ce3cd726c..de6e324bd
de6e324bdseparate emu thread10d3daf86Roms List improvements95d202f37Let's make the rom list process on a separate thread so the emulator doesnt take ages to load.fc306967fWow the ROM Header was just completely busted. Game list view works nowbad1691eefuck this shit2b59e5f46game list in progressd26417b83remappable inputs in progressac4af8106inpute72abc240update readme430139dc9Qt6 frontend3080d4d45Fix this small bug too08cd13b85Cop0 unused functions do not actually pose a threat (as per manual). They don't do anything, so shall we.61bb4fb44make idle loop detection a little more specific with where the load goesb037de4c3SAZDFsdff12e81e73eneed to figure out why n64-systemtest loops indefinitely at some address that appears to be valid (i think it's me not invalidating the cache properly)204f0e13bidle skipping seems to work!cb8bb634asdkfjlasdf58e5c89c1Fix compilation issue on my machine (no idea)24fb2898eattempting more serious idle skipping214719577Place rsp.Step inside cached interpreter. Gains about 3 more fpsbb97dcc23mmmmm920b77d38wjkhasdfjhkasdf430ccdab4it's a start...4f42a673aCached interpreter plays Mario 64. Start looking into RSP as wellc9a030787idle skipping works!5fbda03cenew idea366637abaIdle skipping... maybe?609fa2fb0Cache instructions implemented but broken lmao. Commented out for nowe140a6d12- Stop using inheritance for CPU, instead use composition. - Introduce KAIZEN_JIT_ENABLED optional define instead of relying on __aarch64__ and the like. - More cache work68e613057prep cache impl811b4d809fix clang formatfda755f7didkd5024ebbfsmall MI refactor in preparation of (eventually) implementing the RDRAM interface properly694b45341Merge commit '206dcdedf195fb320913584180edb12c7731e396' as 'external/SDL'206dcdedfSquashed 'external/SDL/' content from commit 4d17b99d0a4d16e1cb4need to update sdl848b19920Fix compilation errordb61b5299Merge commit 'e94a94559f28e49678fbcf72199a5258137b0fe9' as 'external/imgui'e94a94559Squashed 'external/imgui/' content from commit 02e9b8cac52edb3757need to update imguic1a705e86Emulate weird JALR behaviour4b4c32f4bFix exception for "unusable COP1" in 4 instructions i missed accidentally (again)df5828142Bug putting 0s in the log everywheref8b580048Make isviewer a sink to file8241e9735Fix exception for "unusable COP1" in 4 instructions i missed accidentallyb29715f20small changesd9a620bc1make use of my new small utility library0d1aa938eAdd 'external/ircolib/' from commit 'ce3cd726c8df8388d554abf8bb55d55020eb4450'e64eb40b3Fuck git git-subtree-dir: external/ircolib git-subtree-split:de6e324bde
This commit is contained in:
Vendored
+25
@@ -0,0 +1,25 @@
|
||||
configure_file(
|
||||
"${PROJECT_SOURCE_DIR}/cmake/CTestCustom.cmake"
|
||||
"${PROJECT_BINARY_DIR}/CTestCustom.cmake"
|
||||
COPYONLY)
|
||||
|
||||
add_executable(mio.test test.cpp)
|
||||
target_link_libraries(mio.test PRIVATE mio::mio)
|
||||
add_test(NAME mio.test COMMAND mio.test)
|
||||
|
||||
if(WIN32)
|
||||
add_executable(mio.unicode.test test.cpp)
|
||||
target_link_libraries(mio.unicode.test PRIVATE mio::mio)
|
||||
target_compile_definitions(mio.unicode.test PRIVATE UNICODE)
|
||||
add_test(NAME mio.unicode.test COMMAND mio.test)
|
||||
|
||||
add_executable(mio.fullwinapi.test test.cpp)
|
||||
target_link_libraries(mio.fullwinapi.test
|
||||
PRIVATE mio::mio_full_winapi)
|
||||
add_test(NAME mio.fullwinapi.test COMMAND mio.fullwinapi.test)
|
||||
|
||||
add_executable(mio.minwinapi.test test.cpp)
|
||||
target_link_libraries(mio.minwinapi.test
|
||||
PRIVATE mio::mio_min_winapi)
|
||||
add_test(NAME mio.minwinapi.test COMMAND mio.minwinapi.test)
|
||||
endif()
|
||||
Vendored
+75
@@ -0,0 +1,75 @@
|
||||
#include <mio/mmap.hpp>
|
||||
#include <system_error> // for std::error_code
|
||||
#include <cstdio> // for std::printf
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
|
||||
int handle_error(const std::error_code& error);
|
||||
void allocate_file(const std::string& path, const int size);
|
||||
|
||||
int main()
|
||||
{
|
||||
const auto path = "file.txt";
|
||||
|
||||
// NOTE: mio does *not* create the file for you if it doesn't exist! You
|
||||
// must ensure that the file exists before establishing a mapping. It
|
||||
// must also be non-empty. So for illustrative purposes the file is
|
||||
// created now.
|
||||
allocate_file(path, 155);
|
||||
|
||||
// Read-write memory map the whole file by using `map_entire_file` where the
|
||||
// length of the mapping is otherwise expected, with the factory method.
|
||||
std::error_code error;
|
||||
mio::mmap_sink rw_mmap = mio::make_mmap_sink(
|
||||
path, 0, mio::map_entire_file, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
// You can use any iterator based function.
|
||||
std::fill(rw_mmap.begin(), rw_mmap.end(), 'a');
|
||||
|
||||
// Or manually iterate through the mapped region just as if it were any other
|
||||
// container, and change each byte's value (since this is a read-write mapping).
|
||||
for (auto& b : rw_mmap) {
|
||||
b += 10;
|
||||
}
|
||||
|
||||
// Or just change one value with the subscript operator.
|
||||
const int answer_index = rw_mmap.size() / 2;
|
||||
rw_mmap[answer_index] = 42;
|
||||
|
||||
// Don't forget to flush changes to disk before unmapping. However, if
|
||||
// `rw_mmap` were to go out of scope at this point, the destructor would also
|
||||
// automatically invoke `sync` before `unmap`.
|
||||
rw_mmap.sync(error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
// We can then remove the mapping, after which rw_mmap will be in a default
|
||||
// constructed state, i.e. this and the above call to `sync` have the same
|
||||
// effect as if the destructor had been invoked.
|
||||
rw_mmap.unmap();
|
||||
|
||||
// Now create the same mapping, but in read-only mode. Note that calling the
|
||||
// overload without the offset and file length parameters maps the entire
|
||||
// file.
|
||||
mio::mmap_source ro_mmap;
|
||||
ro_mmap.map(path, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
const int the_answer_to_everything = ro_mmap[answer_index];
|
||||
assert(the_answer_to_everything == 42);
|
||||
}
|
||||
|
||||
int handle_error(const std::error_code& error)
|
||||
{
|
||||
const auto& errmsg = error.message();
|
||||
std::printf("error mapping file: %s, exiting...\n", errmsg.c_str());
|
||||
return error.value();
|
||||
}
|
||||
|
||||
void allocate_file(const std::string& path, const int size)
|
||||
{
|
||||
std::ofstream file(path);
|
||||
std::string s(size, '0');
|
||||
file << s;
|
||||
}
|
||||
Vendored
+182
@@ -0,0 +1,182 @@
|
||||
#include <mio/mmap.hpp>
|
||||
#include <mio/shared_mmap.hpp>
|
||||
|
||||
#include <string>
|
||||
#include <fstream>
|
||||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
#include <cassert>
|
||||
#include <system_error>
|
||||
#include <numeric>
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
// Just make sure this compiles.
|
||||
#ifdef CXX17
|
||||
# include <cstddef>
|
||||
using mmap_source = mio::basic_mmap_source<std::byte>;
|
||||
#endif
|
||||
|
||||
template<class MMap>
|
||||
void test_at_offset(const MMap& file_view, const std::string& buffer,
|
||||
const size_t offset);
|
||||
void test_at_offset(const std::string& buffer, const char* path,
|
||||
const size_t offset, std::error_code& error);
|
||||
int handle_error(const std::error_code& error);
|
||||
|
||||
int main()
|
||||
{
|
||||
std::error_code error;
|
||||
|
||||
// Make sure mio compiles with non-const char* strings too.
|
||||
const char _path[] = "test-file";
|
||||
const int path_len = sizeof(_path);
|
||||
char* path = new char[path_len];
|
||||
std::copy(_path, _path + path_len, path);
|
||||
|
||||
const auto page_size = mio::page_size();
|
||||
// Fill buffer, then write it to file.
|
||||
const int file_size = 4 * page_size - 250; // 16134, if page size is 4KiB
|
||||
std::string buffer(file_size, 0);
|
||||
// Start at first printable ASCII character.
|
||||
char v = 33;
|
||||
for (auto& b : buffer) {
|
||||
b = v;
|
||||
++v;
|
||||
// Limit to last printable ASCII character.
|
||||
v %= 126;
|
||||
if(v == 0) {
|
||||
v = 33;
|
||||
}
|
||||
}
|
||||
|
||||
std::ofstream file(path);
|
||||
file << buffer;
|
||||
file.close();
|
||||
|
||||
// Test whole file mapping.
|
||||
test_at_offset(buffer, path, 0, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
// Test starting from below the page size.
|
||||
test_at_offset(buffer, path, page_size - 3, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
// Test starting from above the page size.
|
||||
test_at_offset(buffer, path, page_size + 3, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
// Test starting from above the page size.
|
||||
test_at_offset(buffer, path, 2 * page_size + 3, error);
|
||||
if (error) { return handle_error(error); }
|
||||
|
||||
{
|
||||
#define CHECK_INVALID_MMAP(m) do { \
|
||||
assert(error); \
|
||||
assert(m.empty()); \
|
||||
assert(!m.is_open()); \
|
||||
error.clear(); } while(0)
|
||||
|
||||
mio::mmap_source m;
|
||||
|
||||
// See if mapping an invalid file results in an error.
|
||||
m = mio::make_mmap_source("garbage-that-hopefully-doesnt-exist", 0, 0, error);
|
||||
CHECK_INVALID_MMAP(m);
|
||||
|
||||
// Empty path?
|
||||
m = mio::make_mmap_source(static_cast<const char*>(0), 0, 0, error);
|
||||
CHECK_INVALID_MMAP(m);
|
||||
m = mio::make_mmap_source(std::string(), 0, 0, error);
|
||||
CHECK_INVALID_MMAP(m);
|
||||
|
||||
// Invalid handle?
|
||||
m = mio::make_mmap_source(mio::invalid_handle, 0, 0, error);
|
||||
CHECK_INVALID_MMAP(m);
|
||||
|
||||
// Invalid offset?
|
||||
m = mio::make_mmap_source(path, 100 * buffer.size(), buffer.size(), error);
|
||||
CHECK_INVALID_MMAP(m);
|
||||
}
|
||||
|
||||
// Make sure these compile.
|
||||
{
|
||||
mio::ummap_source _1;
|
||||
mio::shared_ummap_source _2;
|
||||
// Make sure shared_mmap mapping compiles as all testing was done on
|
||||
// normal mmaps.
|
||||
mio::shared_mmap_source _3(path, 0, mio::map_entire_file);
|
||||
auto _4 = mio::make_mmap_source(path, error);
|
||||
auto _5 = mio::make_mmap<mio::shared_mmap_source>(path, 0, mio::map_entire_file, error);
|
||||
#ifdef _WIN32
|
||||
const wchar_t* wpath1 = L"dasfsf";
|
||||
auto _6 = mio::make_mmap_source(wpath1, error);
|
||||
mio::mmap_source _7;
|
||||
_7.map(wpath1, error);
|
||||
const std::wstring wpath2 = wpath1;
|
||||
auto _8 = mio::make_mmap_source(wpath2, error);
|
||||
mio::mmap_source _9;
|
||||
_9.map(wpath1, error);
|
||||
#else
|
||||
const int fd = open(path, O_RDONLY);
|
||||
mio::mmap_source _fdmmap(fd, 0, mio::map_entire_file);
|
||||
_fdmmap.unmap();
|
||||
_fdmmap.map(fd, error);
|
||||
#endif
|
||||
}
|
||||
|
||||
std::printf("all tests passed!\n");
|
||||
}
|
||||
|
||||
void test_at_offset(const std::string& buffer, const char* path,
|
||||
const size_t offset, std::error_code& error)
|
||||
{
|
||||
// Sanity check.
|
||||
assert(offset < buffer.size());
|
||||
|
||||
// Map the region of the file to which buffer was written.
|
||||
mio::mmap_source file_view = mio::make_mmap_source(
|
||||
path, offset, mio::map_entire_file, error);
|
||||
if(error) { return; }
|
||||
|
||||
assert(file_view.is_open());
|
||||
const size_t mapped_size = buffer.size() - offset;
|
||||
assert(file_view.size() == mapped_size);
|
||||
|
||||
test_at_offset(file_view, buffer, offset);
|
||||
|
||||
// Turn file_view into a shared mmap.
|
||||
mio::shared_mmap_source shared_file_view(std::move(file_view));
|
||||
assert(!file_view.is_open());
|
||||
assert(shared_file_view.is_open());
|
||||
assert(shared_file_view.size() == mapped_size);
|
||||
|
||||
//test_at_offset(shared_file_view, buffer, offset);
|
||||
}
|
||||
|
||||
template<class MMap>
|
||||
void test_at_offset(const MMap& file_view, const std::string& buffer,
|
||||
const size_t offset)
|
||||
{
|
||||
// Then verify that mmap's bytes correspond to that of buffer.
|
||||
for(size_t buf_idx = offset, view_idx = 0;
|
||||
buf_idx < buffer.size() && view_idx < file_view.size();
|
||||
++buf_idx, ++view_idx) {
|
||||
if(file_view[view_idx] != buffer[buf_idx]) {
|
||||
std::printf("%luth byte mismatch: expected(%d) <> actual(%d)",
|
||||
buf_idx, buffer[buf_idx], file_view[view_idx]);
|
||||
std::cout << std::flush;
|
||||
assert(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int handle_error(const std::error_code& error)
|
||||
{
|
||||
const auto& errmsg = error.message();
|
||||
std::printf("Error mapping file: %s, exiting...\n", errmsg.c_str());
|
||||
return error.value();
|
||||
}
|
||||
Reference in New Issue
Block a user