00cc9309cb
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
336 lines
8.7 KiB
C++
336 lines
8.7 KiB
C++
/* Copyright (c) 2017-2023 Hans-Kristian Arntzen
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining
|
|
* a copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <stdint.h>
|
|
#include <assert.h>
|
|
#include "intrusive_list.hpp"
|
|
#include "logging.hpp"
|
|
#include "object_pool.hpp"
|
|
#include "bitops.hpp"
|
|
|
|
namespace Util
|
|
{
|
|
// Expands the buddy allocator to consider 32 "buddies".
|
|
// The allocator is logical and works in terms of units, not bytes.
|
|
class LegionAllocator
|
|
{
|
|
public:
|
|
enum
|
|
{
|
|
NumSubBlocks = 32u,
|
|
AllFree = ~0u
|
|
};
|
|
|
|
LegionAllocator(const LegionAllocator &) = delete;
|
|
void operator=(const LegionAllocator &) = delete;
|
|
|
|
LegionAllocator()
|
|
{
|
|
for (auto &v : free_blocks)
|
|
v = AllFree;
|
|
longest_run = 32;
|
|
}
|
|
|
|
~LegionAllocator()
|
|
{
|
|
if (free_blocks[0] != AllFree)
|
|
LOGE("Memory leak in block detected.\n");
|
|
}
|
|
|
|
inline bool full() const
|
|
{
|
|
return free_blocks[0] == 0;
|
|
}
|
|
|
|
inline bool empty() const
|
|
{
|
|
return free_blocks[0] == AllFree;
|
|
}
|
|
|
|
inline uint32_t get_longest_run() const
|
|
{
|
|
return longest_run;
|
|
}
|
|
|
|
void allocate(uint32_t num_blocks, uint32_t &mask, uint32_t &offset);
|
|
void free(uint32_t mask);
|
|
|
|
private:
|
|
uint32_t free_blocks[NumSubBlocks];
|
|
uint32_t longest_run = 0;
|
|
void update_longest_run();
|
|
};
|
|
|
|
// Represents that a legion heap is backed by some kind of allocation.
|
|
template <typename BackingAllocation>
|
|
struct LegionHeap : Util::IntrusiveListEnabled<LegionHeap<BackingAllocation>>
|
|
{
|
|
BackingAllocation allocation;
|
|
Util::LegionAllocator heap;
|
|
};
|
|
|
|
template <typename BackingAllocation>
|
|
struct AllocationArena
|
|
{
|
|
Util::IntrusiveList<LegionHeap<BackingAllocation>> heaps[Util::LegionAllocator::NumSubBlocks];
|
|
Util::IntrusiveList<LegionHeap<BackingAllocation>> full_heaps;
|
|
uint32_t heap_availability_mask = 0;
|
|
};
|
|
|
|
struct SuballocationResult
|
|
{
|
|
uint32_t offset;
|
|
uint32_t size;
|
|
uint32_t mask;
|
|
};
|
|
|
|
template <typename DerivedAllocator, typename BackingAllocation>
|
|
class ArenaAllocator
|
|
{
|
|
public:
|
|
using MiniHeap = LegionHeap<BackingAllocation>;
|
|
|
|
~ArenaAllocator()
|
|
{
|
|
bool error = false;
|
|
|
|
if (heap_arena.full_heaps.begin())
|
|
error = true;
|
|
|
|
for (auto &h : heap_arena.heaps)
|
|
if (h.begin())
|
|
error = true;
|
|
|
|
if (error)
|
|
LOGE("Memory leaked in class allocator!\n");
|
|
}
|
|
|
|
inline void set_sub_block_size(uint32_t size)
|
|
{
|
|
assert(Util::is_pow2(size));
|
|
sub_block_size_log2 = Util::floor_log2(size);
|
|
sub_block_size = size;
|
|
}
|
|
|
|
inline uint32_t get_max_allocation_size() const
|
|
{
|
|
return sub_block_size * Util::LegionAllocator::NumSubBlocks;
|
|
}
|
|
|
|
inline uint32_t get_sub_block_size() const
|
|
{
|
|
return sub_block_size;
|
|
}
|
|
|
|
inline uint32_t get_block_alignment() const
|
|
{
|
|
return get_sub_block_size();
|
|
}
|
|
|
|
inline bool allocate(uint32_t size, BackingAllocation *alloc)
|
|
{
|
|
unsigned num_blocks = (size + sub_block_size - 1) >> sub_block_size_log2;
|
|
uint32_t size_mask = (1u << (num_blocks - 1)) - 1;
|
|
uint32_t index = trailing_zeroes(heap_arena.heap_availability_mask & ~size_mask);
|
|
|
|
if (index < LegionAllocator::NumSubBlocks)
|
|
{
|
|
auto itr = heap_arena.heaps[index].begin();
|
|
assert(itr);
|
|
assert(index >= (num_blocks - 1));
|
|
|
|
auto &heap = *itr;
|
|
static_cast<DerivedAllocator *>(this)->prepare_allocation(alloc, itr, suballocate(num_blocks, heap));
|
|
|
|
unsigned new_index = heap.heap.get_longest_run() - 1;
|
|
|
|
if (heap.heap.full())
|
|
{
|
|
heap_arena.full_heaps.move_to_front(heap_arena.heaps[index], itr);
|
|
if (!heap_arena.heaps[index].begin())
|
|
heap_arena.heap_availability_mask &= ~(1u << index);
|
|
}
|
|
else if (new_index != index)
|
|
{
|
|
auto &new_heap = heap_arena.heaps[new_index];
|
|
new_heap.move_to_front(heap_arena.heaps[index], itr);
|
|
heap_arena.heap_availability_mask |= 1u << new_index;
|
|
if (!heap_arena.heaps[index].begin())
|
|
heap_arena.heap_availability_mask &= ~(1u << index);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// We didn't find a vacant heap, make a new one.
|
|
auto *node = object_pool->allocate();
|
|
if (!node)
|
|
return false;
|
|
|
|
auto &heap = *node;
|
|
|
|
if (!static_cast<DerivedAllocator *>(this)->allocate_backing_heap(&heap.allocation))
|
|
{
|
|
object_pool->free(node);
|
|
return false;
|
|
}
|
|
|
|
// This cannot fail.
|
|
static_cast<DerivedAllocator *>(this)->prepare_allocation(alloc, node, suballocate(num_blocks, heap));
|
|
|
|
if (heap.heap.full())
|
|
{
|
|
heap_arena.full_heaps.insert_front(node);
|
|
}
|
|
else
|
|
{
|
|
unsigned new_index = heap.heap.get_longest_run() - 1;
|
|
heap_arena.heaps[new_index].insert_front(node);
|
|
heap_arena.heap_availability_mask |= 1u << new_index;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
inline void free(typename IntrusiveList<MiniHeap>::Iterator itr, uint32_t mask)
|
|
{
|
|
auto *heap = itr.get();
|
|
auto &block = heap->heap;
|
|
bool was_full = block.full();
|
|
|
|
unsigned index = block.get_longest_run() - 1;
|
|
block.free(mask);
|
|
unsigned new_index = block.get_longest_run() - 1;
|
|
|
|
if (block.empty())
|
|
{
|
|
static_cast<DerivedAllocator *>(this)->free_backing_heap(&heap->allocation);
|
|
|
|
if (was_full)
|
|
heap_arena.full_heaps.erase(heap);
|
|
else
|
|
{
|
|
heap_arena.heaps[index].erase(heap);
|
|
if (!heap_arena.heaps[index].begin())
|
|
heap_arena.heap_availability_mask &= ~(1u << index);
|
|
}
|
|
|
|
object_pool->free(heap);
|
|
}
|
|
else if (was_full)
|
|
{
|
|
heap_arena.heaps[new_index].move_to_front(heap_arena.full_heaps, heap);
|
|
heap_arena.heap_availability_mask |= 1u << new_index;
|
|
}
|
|
else if (index != new_index)
|
|
{
|
|
heap_arena.heaps[new_index].move_to_front(heap_arena.heaps[index], heap);
|
|
heap_arena.heap_availability_mask |= 1u << new_index;
|
|
if (!heap_arena.heaps[index].begin())
|
|
heap_arena.heap_availability_mask &= ~(1u << index);
|
|
}
|
|
}
|
|
|
|
inline void set_object_pool(ObjectPool<MiniHeap> *object_pool_)
|
|
{
|
|
object_pool = object_pool_;
|
|
}
|
|
|
|
protected:
|
|
AllocationArena<BackingAllocation> heap_arena;
|
|
ObjectPool<LegionHeap<BackingAllocation>> *object_pool = nullptr;
|
|
|
|
uint32_t sub_block_size = 1;
|
|
uint32_t sub_block_size_log2 = 0;
|
|
|
|
private:
|
|
inline SuballocationResult suballocate(uint32_t num_blocks, MiniHeap &heap)
|
|
{
|
|
SuballocationResult res = {};
|
|
res.size = num_blocks << sub_block_size_log2;
|
|
heap.heap.allocate(num_blocks, res.mask, res.offset);
|
|
res.offset <<= sub_block_size_log2;
|
|
return res;
|
|
}
|
|
};
|
|
|
|
struct SliceSubAllocator;
|
|
|
|
struct AllocatedSlice
|
|
{
|
|
uint32_t buffer_index = UINT32_MAX;
|
|
uint32_t offset = 0;
|
|
uint32_t count = 0;
|
|
uint32_t mask = 0;
|
|
|
|
SliceSubAllocator *alloc = nullptr;
|
|
Util::IntrusiveList<Util::LegionHeap<AllocatedSlice>>::Iterator heap = {};
|
|
};
|
|
|
|
struct SliceBackingAllocator
|
|
{
|
|
virtual ~SliceBackingAllocator() = default;
|
|
virtual uint32_t allocate(uint32_t count) = 0;
|
|
virtual void free(uint32_t index) = 0;
|
|
virtual void prime(uint32_t count, const void *opaque_meta) = 0;
|
|
};
|
|
|
|
struct SliceBackingAllocatorVA : SliceBackingAllocator
|
|
{
|
|
uint32_t allocate(uint32_t count) override;
|
|
void free(uint32_t index) override;
|
|
void prime(uint32_t count, const void *opaque_meta) override;
|
|
bool allocated = false;
|
|
};
|
|
|
|
struct SliceSubAllocator : Util::ArenaAllocator<SliceSubAllocator, AllocatedSlice>
|
|
{
|
|
SliceSubAllocator *parent = nullptr;
|
|
SliceBackingAllocator *global_allocator = nullptr;
|
|
|
|
// Implements curious recurring template pattern calls.
|
|
bool allocate_backing_heap(AllocatedSlice *allocation);
|
|
void free_backing_heap(AllocatedSlice *allocation) const;
|
|
void prepare_allocation(AllocatedSlice *allocation, Util::IntrusiveList<MiniHeap>::Iterator heap,
|
|
const Util::SuballocationResult &suballoc);
|
|
};
|
|
|
|
class SliceAllocator
|
|
{
|
|
public:
|
|
bool allocate(uint32_t count, Util::AllocatedSlice *slice);
|
|
void free(const Util::AllocatedSlice &slice);
|
|
void prime(const void *opaque_meta);
|
|
|
|
protected:
|
|
SliceAllocator() = default;
|
|
void init(uint32_t sub_block_size, uint32_t num_sub_blocks_in_arena_log2, SliceBackingAllocator *alloc);
|
|
|
|
private:
|
|
Util::ObjectPool<Util::LegionHeap<Util::AllocatedSlice>> object_pool;
|
|
SliceBackingAllocator *global_allocator = nullptr;
|
|
enum { SliceAllocatorCount = 5 };
|
|
Util::SliceSubAllocator allocators[SliceAllocatorCount];
|
|
};
|
|
} |