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.6 by gbeauche, 2004-04-18T23:03:52Z vs.
Revision 1.11 by gbeauche, 2004-11-22T21:50:45Z

# Line 51 | Line 51 | enum {
51    NATIVE_GET_IND_RESOURCE,
52    NATIVE_GET_1_IND_RESOURCE,
53    NATIVE_R_GET_RESOURCE,
54  NATIVE_DISABLE_INTERRUPT,
55  NATIVE_ENABLE_INTERRUPT,
54    NATIVE_MAKE_EXECUTABLE,
55    NATIVE_CHECK_LOAD_INVOC,
56    NATIVE_SYNC_HOOK,
# Line 60 | Line 58 | enum {
58    NATIVE_FILLRECT_HOOK,
59    NATIVE_BITBLT,
60    NATIVE_INVRECT,
61 <  NATIVE_FILLRECT_8,
64 <  NATIVE_FILLRECT_32,
61 >  NATIVE_FILLRECT,
62    NATIVE_OP_MAX
63   };
64  
# Line 88 | 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 96 | 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);
118          static uint32 PageSize();
119 <        static uintptr ZeroPage();
120 <        static uintptr Reserve(uint32 size);
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 119 | Line 134 | inline uint32 SheepMem::PageSize()
134    return page_size;
135   }
136  
137 < inline uintptr SheepMem::ZeroPage()
137 > inline uint32 SheepMem::ZeroPage()
138   {
139    return zero_page;
140   }
141  
142 < inline uintptr SheepMem::Reserve(uint32 size)
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
170   {
171 <        uintptr m_base;
172 <        uint32  m_size;
171 >        uint32 m_base;
172 >        uint32 m_size;
173   public:
174          SheepVar(uint32 requested_size);
175          ~SheepVar() { SheepMem::Release(m_size); }
176 <        uintptr addr() const { return m_base; }
147 <        void *ptr() const { return (void *)addr(); }
176 >        uint32 addr() const { return m_base; }
177   };
178  
179   inline SheepVar::SheepVar(uint32 requested_size)
# Line 155 | Line 184 | inline SheepVar::SheepVar(uint32 request
184  
185   // TODO: optimize for 32-bit platforms
186  
187 < template< int size >
187 > template< int requested_size >
188   struct SheepArray : public SheepVar
189   {
190 <        SheepArray() : SheepVar(size) { }
162 <        uint8 *ptr() const { return (uint8 *)addr(); }
190 >        SheepArray() : SheepVar(requested_size) { }
191   };
192  
193   struct SheepVar32 : public SheepVar
# Line 168 | Line 196 | struct SheepVar32 : public SheepVar
196          SheepVar32(uint32 value) : SheepVar(4) { set_value(value); }
197          uint32 value() const { return ReadMacInt32(addr()); }
198          void set_value(uint32 v) { WriteMacInt32(addr(), v); }
171        uint32 *ptr() const { return (uint32 *)addr(); }
199   };
200  
201   struct SheepString : public SheepVar
202   {
203          SheepString(const char *str) : SheepVar(strlen(str) + 1)
204 <                { if (str) strcpy((char *)addr(), str); else WriteMacInt8(addr(), 0); }
204 >                { if (str) strcpy(value(), str); else WriteMacInt8(addr(), 0); }
205          char *value() const
206 <                { return (char *)addr(); }
180 <        char *ptr() const
181 <                { return (char *)addr(); }
206 >                { return (char *)Mac2HostAddr(addr()); }
207   };
208  
209   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines