Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-28 08:49:20 +00:00
Code Issues Projects Releases Wiki Activity

use proper c++11 std::forward

Browse Source
This commit is contained in:
Kelvin Sherlock 2014-11-21 09:50:56 -05:00
parent 6f50f9de03
commit ff52cae4e9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolbox/stackframe.h
View File

@ -2,6 +2,7 @@
#define __StackFrame_h__ #define __StackFrame_h__
#include <cstdint> #include <cstdint>
#include <utility>
// //
@ -22,9 +23,9 @@ void ToolReturn(uint32_t sp, uint32_t value)
// pre-define these templates to prevent instantiation errors. // pre-define these templates to prevent instantiation errors.
template<int Bytes, int Offset, typename... Args> 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> template<int Bytes, int Offset>
uint32_t StackFrame__(uint32_t sp); uint32_t StackFrame__(uint32_t sp);
@ -39,27 +40,27 @@ uint32_t StackFrame__(uint32_t sp)
} }
template<int Bytes, int Offset, typename... Args> 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)
{ {
x = memoryReadLong(sp + Offset - 4); x = memoryReadLong(sp + Offset - 4);
return StackFrame__<Bytes, Offset - 4>(sp, args...); return StackFrame__<Bytes, Offset - 4>(sp, std::forward<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)
{ {
x = memoryReadWord(sp + Offset - 2); x = memoryReadWord(sp + Offset - 2);
return StackFrame__<Bytes, Offset - 2>(sp, args...); 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)
{ {
uint32_t sp = cpuGetAReg(7); uint32_t sp = cpuGetAReg(7);
return StackFrame__<Bytes, Bytes>(sp, args...); return StackFrame__<Bytes, Bytes>(sp, std::forward<Args>(args)...);
} }