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.8 by gbeauche, 2004-06-22T17:10:08Z vs.
Revision 1.9 by gbeauche, 2004-11-13T14:09:16Z

# Line 99 | Line 99 | public:
99          static bool Init(void);
100          static void Exit(void);
101          static uint32 PageSize();
102 <        static uintptr ZeroPage();
103 <        static uintptr Reserve(uint32 size);
102 >        static uint32 ZeroPage();
103 >        static uint32 Reserve(uint32 size);
104          static void Release(uint32 size);
105          friend class SheepVar;
106   };
# Line 116 | Line 116 | inline uint32 SheepMem::PageSize()
116    return page_size;
117   }
118  
119 < inline uintptr SheepMem::ZeroPage()
119 > inline uint32 SheepMem::ZeroPage()
120   {
121    return zero_page;
122   }
123  
124 < inline uintptr SheepMem::Reserve(uint32 size)
124 > inline uint32 SheepMem::Reserve(uint32 size)
125   {
126          top -= align(size);
127          assert(top >= base);
# Line 135 | Line 135 | inline void SheepMem::Release(uint32 siz
135  
136   class SheepVar
137   {
138 <        uintptr m_base;
139 <        uint32  m_size;
138 >        uint32 m_base;
139 >        uint32 m_size;
140   public:
141          SheepVar(uint32 requested_size);
142          ~SheepVar() { SheepMem::Release(m_size); }
143 <        uintptr addr() const { return m_base; }
144 <        void *ptr() const { return (void *)addr(); }
143 >        uint32 addr() const { return m_base; }
144   };
145  
146   inline SheepVar::SheepVar(uint32 requested_size)
# Line 152 | Line 151 | inline SheepVar::SheepVar(uint32 request
151  
152   // TODO: optimize for 32-bit platforms
153  
154 < template< int size >
154 > template< int requested_size >
155   struct SheepArray : public SheepVar
156   {
157 <        SheepArray() : SheepVar(size) { }
159 <        uint8 *ptr() const { return (uint8 *)addr(); }
157 >        SheepArray() : SheepVar(requested_size) { }
158   };
159  
160   struct SheepVar32 : public SheepVar
# Line 165 | Line 163 | struct SheepVar32 : public SheepVar
163          SheepVar32(uint32 value) : SheepVar(4) { set_value(value); }
164          uint32 value() const { return ReadMacInt32(addr()); }
165          void set_value(uint32 v) { WriteMacInt32(addr(), v); }
168 –        uint32 *ptr() const { return (uint32 *)addr(); }
166   };
167  
168   struct SheepString : public SheepVar
169   {
170          SheepString(const char *str) : SheepVar(strlen(str) + 1)
171 <                { if (str) strcpy((char *)addr(), str); else WriteMacInt8(addr(), 0); }
171 >                { if (str) strcpy(value(), str); else WriteMacInt8(addr(), 0); }
172          char *value() const
173 <                { return (char *)addr(); }
177 <        char *ptr() const
178 <                { return (char *)addr(); }
173 >                { return (char *)Mac2HostAddr(addr()); }
174   };
175  
176   #endif

Diff Legend

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