ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp
(Generate patch)

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.60 by gbeauche, 2005-03-17T23:40:01Z vs.
Revision 1.61 by gbeauche, 2005-06-22T16:38:15Z

# Line 183 | Line 183 | public:
183          void operator delete(void *p);
184   };
185  
186 < // Memory allocator returning areas aligned on 16-byte boundaries
186 > // Memory allocator returning sheepshaver_cpu objects aligned on 16-byte boundaries
187 > // FORMAT: [ alignment ] magic identifier, offset to malloc'ed data, sheepshaver_cpu data
188   void *sheepshaver_cpu::operator new(size_t size)
189   {
190 <        void *p;
190 >        const int ALIGN = 16;
191  
192 < #if defined(HAVE_POSIX_MEMALIGN)
193 <        if (posix_memalign(&p, 16, size) != 0)
192 >        // Allocate enough space for sheepshaver_cpu data + signature + align pad
193 >        uint8 *ptr = (uint8 *)malloc(size + ALIGN * 2);
194 >        if (ptr == NULL)
195                  throw std::bad_alloc();
194 #elif defined(HAVE_MEMALIGN)
195        p = memalign(16, size);
196 #elif defined(HAVE_VALLOC)
197        p = valloc(size); // page-aligned!
198 #else
199        /* XXX: handle padding ourselves */
200        p = malloc(size);
201 #endif
196  
197 <        return p;
197 >        // Align memory
198 >        int ofs = 0;
199 >        while ((((uintptr)ptr) % ALIGN) != 0)
200 >                ofs++, ptr++;
201 >
202 >        // Insert signature and offset
203 >        struct aligned_block_t {
204 >                uint32 pad[(ALIGN - 8) / 4];
205 >                uint32 signature;
206 >                uint32 offset;
207 >                uint8  data[sizeof(sheepshaver_cpu)];
208 >        };
209 >        aligned_block_t *blk = (aligned_block_t *)ptr;
210 >        blk->signature = FOURCC('S','C','P','U');
211 >        blk->offset = ofs + (&blk->data[0] - (uint8 *)blk);
212 >        assert((((uintptr)&blk->data) % ALIGN) == 0);
213 >        return &blk->data[0];
214   }
215  
216   void sheepshaver_cpu::operator delete(void *p)
217   {
218 < #if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
219 < #if defined(__GLIBC__)
220 <        // this is known to work only with GNU libc
221 <        free(p);
212 < #endif
213 < #else
214 <        free(p);
215 < #endif
218 >        uint32 *blk = (uint32 *)p;
219 >        assert(blk[-2] == FOURCC('S','C','P','U'));
220 >        void *ptr = (void *)(((uintptr)p) - blk[-1]);
221 >        free(ptr);
222   }
223  
224   sheepshaver_cpu::sheepshaver_cpu()

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines