ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/include/thunks.h
(Generate patch)

Comparing SheepShaver/src/include/thunks.h (file contents):
Revision 1.9 by gbeauche, 2004-11-13T14:09:16Z vs.
Revision 1.11 by gbeauche, 2004-11-22T21:50:45Z

# Line 85 | Line 85 | extern uint32 NativeRoutineDescriptor(in
85  
86   /*
87   *  Helpers to share 32-bit addressable data with MacOS
88 + *
89 + *  There are two distinct allocatable regions:
90 + *
91 + *  - The Data region is used to share data between MacOS and
92 + *    SheepShaver. This is stack-like allocation since it is
93 + *    meant to only hold temporary data which dies at the end
94 + *    of the current function scope.
95 + *
96 + *  - The Procedure region is used to hold permanent M68K or
97 + *    PowerPC code to assist native routine implementations.
98 + *
99 + *  - The Procedure region grows up whereas the Data region
100 + *    grows down. They may intersect into the ZeroPage, which
101 + *    is a read-only page with all bits set to zero. In practise,
102 + *    the intersection is unlikely since the Procedure region is
103 + *    static and the Data region is meant to be small (< 256 KB).
104   */
105  
106   class SheepMem {
# Line 93 | Line 109 | protected:
109          static uint32  page_size;
110          static uintptr zero_page;
111          static uintptr base;
112 <        static uintptr top;
113 <        static const uint32 size = 0x40000; // 256 KB
112 >        static uintptr data;
113 >        static uintptr proc;
114 >        static const uint32 size = 0x80000; // 512 KB
115   public:
116          static bool Init(void);
117          static void Exit(void);
# Line 102 | Line 119 | public:
119          static uint32 ZeroPage();
120          static uint32 Reserve(uint32 size);
121          static void Release(uint32 size);
122 +        static uint32 ReserveProc(uint32 size);
123          friend class SheepVar;
124   };
125  
# Line 123 | Line 141 | inline uint32 SheepMem::ZeroPage()
141  
142   inline uint32 SheepMem::Reserve(uint32 size)
143   {
144 <        top -= align(size);
145 <        assert(top >= base);
146 <        return top;
144 >        data -= align(size);
145 >        assert(data >= proc);
146 >        return data;
147   }
148  
149   inline void SheepMem::Release(uint32 size)
150   {
151 <        top += align(size);
151 >        data += align(size);
152 > }
153 >
154 > inline uint32 SheepMem::ReserveProc(uint32 size)
155 > {
156 >        uint32 mproc = proc;
157 >        proc += align(size);
158 >        assert(proc < data);
159 >        return mproc;
160 > }
161 >
162 > static inline uint32 SheepProc(const uint8 *proc, uint32 proc_size)
163 > {
164 >        uint32 mac_proc = SheepMem::ReserveProc(proc_size);
165 >        Host2Mac_memcpy(mac_proc, proc, proc_size);
166 >        return mac_proc;
167   }
168  
169   class SheepVar

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines