summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/process.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-13 04:52:12 +0200
committerGitHub <noreply@github.com>2018-10-13 04:52:12 +0200
commitc2aa4293ec647a3712299c5b53f3ca592aaf9c0e (patch)
tree08a703b6913733042091e16c7c90cc34d991f537 /src/core/hle/kernel/process.h
parentMerge pull request #1484 from FernandoS27/calculate-size (diff)
parentkernel/process: Make CodeSet a regular non-inherited object (diff)
downloadyuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar.gz
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar.bz2
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar.lz
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar.xz
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.tar.zst
yuzu-c2aa4293ec647a3712299c5b53f3ca592aaf9c0e.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/process.h28
1 files changed, 5 insertions, 23 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h
index 590e0c73d..73ec01e11 100644
--- a/src/core/hle/kernel/process.h
+++ b/src/core/hle/kernel/process.h
@@ -61,26 +61,15 @@ enum class ProcessStatus { Created, Running, Exited };
class ResourceLimit;
-struct CodeSet final : public Object {
+struct CodeSet final {
struct Segment {
std::size_t offset = 0;
VAddr addr = 0;
u32 size = 0;
};
- static SharedPtr<CodeSet> Create(KernelCore& kernel, std::string name);
-
- std::string GetTypeName() const override {
- return "CodeSet";
- }
- std::string GetName() const override {
- return name;
- }
-
- static const HandleType HANDLE_TYPE = HandleType::CodeSet;
- HandleType GetHandleType() const override {
- return HANDLE_TYPE;
- }
+ explicit CodeSet();
+ ~CodeSet();
Segment& CodeSegment() {
return segments[0];
@@ -109,14 +98,7 @@ struct CodeSet final : public Object {
std::shared_ptr<std::vector<u8>> memory;
std::array<Segment, 3> segments;
- VAddr entrypoint;
-
- /// Name of the process
- std::string name;
-
-private:
- explicit CodeSet(KernelCore& kernel);
- ~CodeSet() override;
+ VAddr entrypoint = 0;
};
class Process final : public Object {
@@ -219,7 +201,7 @@ public:
*/
void PrepareForTermination();
- void LoadModule(SharedPtr<CodeSet> module_, VAddr base_addr);
+ void LoadModule(CodeSet module_, VAddr base_addr);
///////////////////////////////////////////////////////////////////////////////////////////////
// Memory Management