PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link CMemoryInStream.cpp 

Former-commit-id: 437b1dd3a6
This commit is contained in:
Phillip Stephens 2022-07-19 23:19:07 -07:00
parent a4b184903f
commit 6473aae6a9
9 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/Kyoto/CFactoryMgr.s
View File

@ -197,7 +197,7 @@ lbl_80338798:
/* 803387C8 00335728 7F 44 D3 78 */ mr r4, r26
/* 803387CC 0033572C 7F 65 DB 78 */ mr r5, r27
/* 803387D0 00335730 38 C0 00 00 */ li r6, 0
/* 803387D4 00335734 48 00 6A 39 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 803387D4 00335734 48 00 6A 39 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 803387D8 00335738 7C 64 1B 78 */ mr r4, r3
lbl_803387DC:
/* 803387DC 0033573C 7C 04 00 D0 */ neg r0, r4
@ -362,7 +362,7 @@ lbl_80338A00:
/* 80338A28 00335988 7F 44 D3 78 */ mr r4, r26
/* 80338A2C 0033598C 7F 65 DB 78 */ mr r5, r27
/* 80338A30 00335990 38 C0 00 00 */ li r6, 0
/* 80338A34 00335994 48 00 67 D9 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 80338A34 00335994 48 00 67 D9 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 80338A38 00335998 7C 7C 1B 78 */ mr r28, r3
lbl_80338A3C:
/* 80338A3C 0033599C 7F 83 E3 78 */ mr r3, r28
@ -417,7 +417,7 @@ lbl_80338AF0:
/* 80338AF4 00335A54 7F 65 DB 78 */ mr r5, r27
/* 80338AF8 00335A58 38 61 00 60 */ addi r3, r1, 0x60
/* 80338AFC 00335A5C 38 C0 00 00 */ li r6, 0
/* 80338B00 00335A60 48 00 67 0D */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 80338B00 00335A60 48 00 67 0D */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 80338B04 00335A64 7F 2C CB 78 */ mr r12, r25
/* 80338B08 00335A68 7F C4 F3 78 */ mr r4, r30
/* 80338B0C 00335A6C 7F E6 FB 78 */ mr r6, r31

4
asm/Kyoto/CResLoader.s
View File

@ -814,7 +814,7 @@ lbl_8033B724:
/* 8033B76C 003386CC 7C 00 FB 78 */ or r0, r0, r31
/* 8033B770 003386D0 7F C5 F3 78 */ mr r5, r30
/* 8033B774 003386D4 54 06 0F FE */ srwi r6, r0, 0x1f
/* 8033B778 003386D8 48 00 3A 95 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 8033B778 003386D8 48 00 3A 95 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 8033B77C 003386DC 7C 60 1B 78 */ mr r0, r3
lbl_8033B780:
/* 8033B780 003386E0 BB 41 00 18 */ lmw r26, 0x18(r1)
@ -1010,7 +1010,7 @@ lbl_8033B9E4:
/* 8033BA38 00338998 7F 83 E3 78 */ mr r3, r28
/* 8033BA3C 0033899C 7F A4 EB 78 */ mr r4, r29
/* 8033BA40 003389A0 7F C6 F3 78 */ mr r6, r30
/* 8033BA44 003389A4 48 00 37 C9 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 8033BA44 003389A4 48 00 37 C9 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 8033BA48 003389A8 7C 7C 1B 78 */ mr r28, r3
lbl_8033BA4C:
/* 8033BA4C 003389AC 7F E3 FB 78 */ mr r3, r31

4
asm/Kyoto/Streams/CMemoryInStream.s
View File

@ -36,8 +36,8 @@ __ct__15CMemoryInStreamFPCvUl:
/* 8033F204 0033C164 38 21 00 10 */ addi r1, r1, 0x10
/* 8033F208 0033C168 4E 80 00 20 */ blr
.global __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
__ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip:
.global __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
__ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip:
/* 8033F20C 0033C16C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8033F210 0033C170 7C 08 02 A6 */ mflr r0
/* 8033F214 0033C174 90 01 00 14 */ stw r0, 0x14(r1)

4
asm/Kyoto/Text/CTextRenderBuffer.s
View File

@ -31,7 +31,7 @@ AccumulateTextBounds__17CTextRenderBufferFv:
/* 80359B2C 00356A8C 38 61 00 50 */ addi r3, r1, 0x50
/* 80359B30 00356A90 80 BB 00 44 */ lwz r5, 0x44(r27)
/* 80359B34 00356A94 38 C0 00 01 */ li r6, 1
/* 80359B38 00356A98 4B FE 56 D5 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 80359B38 00356A98 4B FE 56 D5 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 80359B3C 00356A9C 3B A1 00 44 */ addi r29, r1, 0x44
/* 80359B40 00356AA0 3B 81 00 4C */ addi r28, r1, 0x4c
/* 80359B44 00356AA4 48 00 03 18 */ b lbl_80359E5C
@ -727,7 +727,7 @@ Render__17CTextRenderBufferCFRC6CColorf:
/* 8035A500 00357460 38 C0 00 01 */ li r6, 1
/* 8035A504 00357464 80 98 00 40 */ lwz r4, 0x40(r24)
/* 8035A508 00357468 80 B8 00 44 */ lwz r5, 0x44(r24)
/* 8035A50C 0035746C 4B FE 4D 01 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 8035A50C 0035746C 4B FE 4D 01 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 8035A510 00357470 3B 78 00 54 */ addi r27, r24, 0x54
/* 8035A514 00357474 48 00 06 60 */ b lbl_8035AB74
lbl_8035A518:

2
asm/MetroidPrime/main.s
View File

@ -2186,7 +2186,7 @@ lbl_80004654:
/* 80004680 000015E0 38 61 00 28 */ addi r3, r1, 0x28
/* 80004684 000015E4 80 A1 00 1C */ lwz r5, 0x1c(r1)
/* 80004688 000015E8 38 C0 00 01 */ li r6, 1
/* 8000468C 000015EC 48 33 AB 81 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 8000468C 000015EC 48 33 AB 81 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 80004690 000015F0 3C 80 80 3D */ lis r4, lbl_803CBE74@ha
/* 80004694 000015F4 38 60 02 30 */ li r3, 0x230
/* 80004698 000015F8 38 84 BE 74 */ addi r4, r4, lbl_803CBE74@l

2
asm/WorldFormat/CAreaOctTree.s
View File

@ -158,7 +158,7 @@ MakeFromMemory__12CAreaOctTreeFPvUiPP12CAreaOctTreePb:
/* 802A2B4C 0029FAAC 7C 05 03 78 */ mr r5, r0
/* 802A2B50 0029FAB0 38 61 00 40 */ addi r3, r1, 0x40
/* 802A2B54 0029FAB4 38 C0 00 01 */ li r6, 1
/* 802A2B58 0029FAB8 48 09 C6 B5 */ bl __ct__15CMemoryInStreamFPvUlQ215CMemoryInStream10EOwnerShip
/* 802A2B58 0029FAB8 48 09 C6 B5 */ bl __ct__15CMemoryInStreamFPCvUlQ215CMemoryInStream10EOwnerShip
/* 802A2B5C 0029FABC 38 61 00 40 */ addi r3, r1, 0x40
/* 802A2B60 0029FAC0 48 09 C1 25 */ bl ReadLong__12CInputStreamFv
/* 802A2B64 0029FAC4 38 61 00 40 */ addi r3, r1, 0x40

6
include/Kyoto/Streams/CMemoryInStream.hpp
View File

@ -1,13 +1,13 @@
#ifndef _CMEMORYINSTREAM_HPP
#define _CMEMORYINSTREAM_HPP
#include "CInputStream.hpp"
#include "Kyoto/Streams/CInputStream.hpp"
class CMemoryInStream : public CInputStream {
public:
enum EOwnerShip {
NotOwned,
Owned,
kOS_NotOwned,
kOS_Owned,
};
CMemoryInStream(const void* ptr, unsigned long len);

2
obj_files.mk
View File

@ -561,7 +561,7 @@ KYOTO :=\
$(BUILD_DIR)/asm/Kyoto/rstl/rstl_strings.o\
$(BUILD_DIR)/asm/Kyoto/rstl/RstlExtras.o\
$(BUILD_DIR)/src/Kyoto/Streams/CInputStream.o\
$(BUILD_DIR)/asm/Kyoto/Streams/CMemoryInStream.o\
$(BUILD_DIR)/src/Kyoto/Streams/CMemoryInStream.o\
$(BUILD_DIR)/asm/Kyoto/Streams/CMemoryStreamOut.o\
$(BUILD_DIR)/asm/Kyoto/Streams/COutputStream.o\
$(BUILD_DIR)/asm/Kyoto/Streams/CZipInputStream.o\

11
src/Kyoto/Streams/CMemoryInStream.cpp Normal file
View File

@ -0,0 +1,11 @@
#include "Kyoto/Streams/CMemoryInStream.hpp"
u32 CMemoryInStream::Read(void* dest, u32 len) {
return 0;
}
CMemoryInStream::CMemoryInStream(const void* ptr, unsigned long len)
: CInputStream(ptr, len, false) {}
CMemoryInStream::CMemoryInStream(const void* ptr, unsigned long len, EOwnerShip ownership)
: CInputStream(ptr, len, ownership == kOS_NotOwned) {}