mirror of
https://github.com/yuzu-emu/sirit
synced 2024-11-22 12:33:37 +00:00
Add global variables
This commit is contained in:
parent
a3022e4969
commit
54cc7d06ce
3 changed files with 28 additions and 18 deletions
|
@ -62,6 +62,13 @@ class Module {
|
|||
*/
|
||||
Ref Emit(Ref op);
|
||||
|
||||
/**
|
||||
* Adds a global variable
|
||||
* @param variable Global variable to add.
|
||||
* @return Returns variable.
|
||||
*/
|
||||
Ref AddGlobalVariable(Ref variable);
|
||||
|
||||
// Types
|
||||
|
||||
/// Returns type void.
|
||||
|
@ -233,6 +240,8 @@ class Module {
|
|||
|
||||
std::vector<std::unique_ptr<Op>> declarations;
|
||||
|
||||
std::vector<Ref> global_variables;
|
||||
|
||||
std::vector<Ref> code;
|
||||
|
||||
std::vector<std::unique_ptr<Op>> code_store;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include <cassert>
|
||||
#include <optional>
|
||||
|
||||
#include "sirit/sirit.h"
|
||||
#include "insts.h"
|
||||
|
||||
|
|
|
@ -20,6 +20,13 @@ static void WriteEnum(Stream& stream, spv::Op opcode, T value) {
|
|||
op.Write(stream);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void WriteSet(Stream& stream, const T& set) {
|
||||
for (const auto& item : set) {
|
||||
item->Write(stream);
|
||||
}
|
||||
}
|
||||
|
||||
Module::Module() {}
|
||||
|
||||
Module::~Module() = default;
|
||||
|
@ -37,9 +44,7 @@ std::vector<u8> Module::Assemble() const {
|
|||
for (auto capability : capabilities) {
|
||||
WriteEnum(stream, spv::Op::OpCapability, capability);
|
||||
}
|
||||
|
||||
// TODO write extensions
|
||||
|
||||
// TODO write ext inst imports
|
||||
|
||||
Op memory_model_ref{spv::Op::OpMemoryModel};
|
||||
|
@ -47,24 +52,13 @@ std::vector<u8> Module::Assemble() const {
|
|||
memory_model_ref.Add(static_cast<u32>(memory_model));
|
||||
memory_model_ref.Write(stream);
|
||||
|
||||
for (const auto& entry_point : entry_points) {
|
||||
entry_point->Write(stream);
|
||||
}
|
||||
|
||||
WriteSet(stream, entry_points);
|
||||
// TODO write execution mode
|
||||
|
||||
for (const auto& debug_symbol : debug) {
|
||||
debug_symbol->Write(stream);
|
||||
}
|
||||
|
||||
WriteSet(stream, debug);
|
||||
// TODO write annotations
|
||||
|
||||
for (const auto& decl : declarations) {
|
||||
decl->Write(stream);
|
||||
}
|
||||
for (const auto& line : code) {
|
||||
line->Write(stream);
|
||||
}
|
||||
WriteSet(stream, declarations);
|
||||
WriteSet(stream, global_variables);
|
||||
WriteSet(stream, code);
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
@ -98,6 +92,12 @@ Ref Module::Emit(Ref op) {
|
|||
return op;
|
||||
}
|
||||
|
||||
Ref Module::AddGlobalVariable(Ref variable) {
|
||||
assert(variable);
|
||||
global_variables.push_back(variable);
|
||||
return variable;
|
||||
}
|
||||
|
||||
Ref Module::AddCode(Op* op) {
|
||||
code_store.push_back(std::unique_ptr<Op>(op));
|
||||
return op;
|
||||
|
|
Loading…
Reference in a new issue