Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-24 13:32:39 +00:00
Code Issues Projects Releases Wiki Activity

fix stack frames with byte values

Browse Source
This commit is contained in:
Kelvin Sherlock 2015-01-05 13:11:50 -05:00
parent 24e47c7f9b
commit 7eb33de435
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolbox/stackframe.h
View File

@ -26,6 +26,9 @@ template<int Bytes, int Offset, typename... Args>
uint32_t StackFrame__(uint32_t sp, uint32_t &x, Args&&... args); uint32_t StackFrame__(uint32_t sp, uint32_t &x, Args&&... args);
template<int Bytes, int Offset, typename... Args> template<int Bytes, int Offset, typename... Args>
uint32_t StackFrame__(uint32_t sp, uint16_t &x, Args&&... args); uint32_t StackFrame__(uint32_t sp, uint16_t &x, Args&&... args);
template<int Bytes, int Offset, typename... Args>
uint32_t StackFrame__(uint32_t sp, uint8_t &x, Args&&... args);
template<int Bytes, int Offset> template<int Bytes, int Offset>
uint32_t StackFrame__(uint32_t sp); uint32_t StackFrame__(uint32_t sp);
@ -55,6 +58,16 @@ uint32_t StackFrame__(uint32_t sp, uint16_t &x, Args&&... args)
return StackFrame__<Bytes, Offset - 2>(sp, std::forward<Args>(args)...); return StackFrame__<Bytes, Offset - 2>(sp, std::forward<Args>(args)...);
} }
template<int Bytes, int Offset, typename... Args>
uint32_t StackFrame__(uint32_t sp, uint8_t &x, Args&&... args)
{
// byte pushes as 2 bytes with 1 garbage byte
x = memoryReadByte(sp + Offset - 2);
return StackFrame__<Bytes, Offset - 2>(sp, std::forward<Args>(args)...);
}
template<int Bytes, typename... Args> template<int Bytes, typename... Args>
uint32_t StackFrame(Args&&... args) uint32_t StackFrame(Args&&... args)
{ {