1
0
Fork 0
mirror of https://git.suyu.dev/suyu/sirit.git synced 2024-12-23 04:32:04 +00:00

Move flow and function opcodes into their own file

This commit is contained in:
ReinUsesLisp 2018-08-26 05:01:31 -03:00
parent 3bd3688567
commit c2215fca0e
6 changed files with 63 additions and 27 deletions

View file

@ -47,18 +47,31 @@ public:
void AddEntryPoint(spv::ExecutionModel execution_model, const Op* entry_point,
const std::string& name, const std::vector<const Op*>& interfaces = {});
/**
* Adds an instruction to module's code
* @param op Instruction to insert into code. Types must not be emitted
* @return Returns op.
*/
const Op* Emit(const Op* op);
// Types
/// Returns type void.
const Op* TypeVoid();
/// Returns a function type.
const Op* TypeFunction(const Op* return_type, const std::vector<const Op*>& arguments = {});
/// Adds an instruction to module's code block
const Op* Emit(const Op* op);
// Function
/// Emits a function.
const Op* Function(const Op* result_type, spv::FunctionControlMask function_control,
const Op* function_type);
const Op* function_type);
/// Emits a function end.
const Op* FunctionEnd();
// Flow
/// Emits a label. It starts a block.
const Op* Label();
@ -66,9 +79,6 @@ public:
/// Emits a return. It ends a block.
const Op* Return();
/// Emits a function end.
const Op* FunctionEnd();
private:
const Op* AddCode(Op* op);

View file

@ -9,7 +9,9 @@ add_library(sirit
operand.h
common_types.h
opcodes.h
opcodes_type.cpp
opcodes/type.cpp
opcodes/function.cpp
opcodes/flow.cpp
)
target_include_directories(sirit
PUBLIC ../include

20
src/opcodes/flow.cpp Normal file
View file

@ -0,0 +1,20 @@
/* This file is part of the sirit project.
* Copyright (c) 2018 ReinUsesLisp
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#include "sirit/sirit.h"
#include "opcodes.h"
namespace Sirit {
const Op* Module::Label() {
return AddCode(spv::Op::OpLabel, bound++);
}
const Op* Module::Return() {
return AddCode(spv::Op::OpReturn);
}
} // namespace Sirit

24
src/opcodes/function.cpp Normal file
View file

@ -0,0 +1,24 @@
/* This file is part of the sirit project.
* Copyright (c) 2018 ReinUsesLisp
* This software may be used and distributed according to the terms of the GNU
* General Public License version 2 or any later version.
*/
#include "sirit/sirit.h"
#include "opcodes.h"
namespace Sirit {
const Op* Module::Function(const Op* result_type, spv::FunctionControlMask function_control,
const Op* function_type) {
Op* op{new Op{spv::Op::OpFunction, bound++, result_type}};
op->Add(static_cast<u32>(function_control));
op->Add(function_type);
return AddCode(op);
}
const Op* Module::FunctionEnd() {
return AddCode(spv::Op::OpFunctionEnd);
}
} // namespace Sirit

View file

@ -89,26 +89,6 @@ const Op* Module::Emit(const Op* op) {
return op;
}
const Op* Module::Function(const Op* result_type, spv::FunctionControlMask function_control,
const Op* function_type) {
Op* op{new Op{spv::Op::OpFunction, bound++, result_type}};
op->Add(static_cast<u32>(function_control));
op->Add(function_type);
return AddCode(op);
}
const Op* Module::Label() {
return AddCode(spv::Op::OpLabel, bound++);
}
const Op* Module::Return() {
return AddCode(spv::Op::OpReturn);
}
const Op* Module::FunctionEnd() {
return AddCode(spv::Op::OpFunctionEnd);
}
const Op* Module::AddCode(Op* op) {
code_store.push_back(std::unique_ptr<Op>(op));
return op;