Index: branches/cparm/Chameleon.xcodeproj/project.pbxproj =================================================================== --- branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 2182) +++ branches/cparm/Chameleon.xcodeproj/project.pbxproj (revision 2183) @@ -475,6 +475,7 @@ AB5BBD77164D3C9A000C872E /* pack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pack.c; sourceTree = ""; }; AB79217514F38CF200F5EB39 /* bootXnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bootXnu.h; sourceTree = ""; }; AB79219214F3919E00F5EB39 /* ModuleHelp.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ModuleHelp.txt; sourceTree = ""; }; + AB7BC1DD16C80A0C00EA5FAE /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; AB7BEAC116C2A6C60098D72E /* __libc_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __libc_init.c; sourceTree = ""; }; AB7BEAC216C2A6C60098D72E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; AB7BEAC416C2A6C60098D72E /* fclose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fclose.c; sourceTree = ""; }; @@ -828,6 +829,8 @@ ABAEBAFB16C3EB6E0010968B /* PngFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = PngFile.c; sourceTree = ""; }; ABAEBAFC16C3EB6E0010968B /* PngFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PngFile.h; sourceTree = ""; }; ABAEBAFD16C3EB6E0010968B /* tryme.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tryme.c; sourceTree = ""; }; + ABB0131B16C6CBED001EEC83 /* memcpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memcpy.c; sourceTree = ""; }; + ABB0131C16C6CBED001EEC83 /* memcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memcpy.h; sourceTree = ""; }; ABB4CE7D151E39740053B64E /* lzss.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lzss.c; sourceTree = ""; }; ABBBFCF715D557A4002D7A1E /* md.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = md.c; sourceTree = ""; }; ABBBFCFA15D55908002D7A1E /* ld_classic */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = ld_classic; sourceTree = ""; }; @@ -838,8 +841,6 @@ ABD9A1FF150F80C4008DA465 /* CoreHash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CoreHash.c; sourceTree = ""; }; ABE5FF4E14F9495500447F78 /* modules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = modules.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; ABE5FF4F14F9495500447F78 /* modules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = modules.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - ABFA456816C5372D004869B8 /* memcpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memcpy.c; sourceTree = ""; }; - ABFA456916C5372D004869B8 /* memcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memcpy.h; sourceTree = ""; }; ABFF913F169D87C200D6BEBB /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; ABFF9140169D87C200D6BEBB /* png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = png.c; sourceTree = ""; }; ABFF9144169D87C200D6BEBB /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pngerror.c; sourceTree = ""; }; @@ -2359,9 +2360,10 @@ ABAEBAFA16C3EB6E0010968B /* Makefile */, ABAEBAFB16C3EB6E0010968B /* PngFile.c */, ABAEBAFC16C3EB6E0010968B /* PngFile.h */, - ABFA456816C5372D004869B8 /* memcpy.c */, - ABFA456916C5372D004869B8 /* memcpy.h */, + ABB0131B16C6CBED001EEC83 /* memcpy.c */, + ABB0131C16C6CBED001EEC83 /* memcpy.h */, ABAEBAFD16C3EB6E0010968B /* tryme.c */, + AB7BC1DD16C80A0C00EA5FAE /* README */, ); path = Libeg; sourceTree = ""; Index: branches/cparm/CHANGES =================================================================== --- branches/cparm/CHANGES (revision 2182) +++ branches/cparm/CHANGES (revision 2183) @@ -1,3 +1,11 @@ +- Added a test suite for libeg , please see the README +- Added egpng.c, egview, egimageview to libeg +- Added libeg (based on refit-libeg) +- Added libefi (based on edk2) +- Updated module/include (it should be more standard now) +- Added libc +- Removed libsaio module + - Updated platform.c - Updated modules.c Index: branches/cparm/i386/libsaio/time.c =================================================================== --- branches/cparm/i386/libsaio/time.c (revision 2182) +++ branches/cparm/i386/libsaio/time.c (revision 2183) @@ -119,7 +119,7 @@ { cpu_khz = (uint32_t)(get_env(envCPUFreq) / 1000); if (!(cpu_khz>0)) { - return 1; + return -1; } /* * Call the gtod init when we need it - this keeps the code from Index: branches/cparm/i386/modules/Libeg/egimage.c =================================================================== --- branches/cparm/i386/modules/Libeg/egimage.c (revision 2182) +++ branches/cparm/i386/modules/Libeg/egimage.c (revision 2183) @@ -38,6 +38,7 @@ #include #include #include "memcpy.h" // a fast memcpy +#include #define MAX_FILE_SIZE (1024*1024*1024) Index: branches/cparm/i386/modules/Libeg/memcpy.h =================================================================== --- branches/cparm/i386/modules/Libeg/memcpy.h (revision 0) +++ branches/cparm/i386/modules/Libeg/memcpy.h (revision 2183) @@ -0,0 +1,63 @@ +/******************************************************************** + ** File: memcpy.h + ** + ** Copyright (C) 2005 Daniel Vik + ** + ** This software is provided 'as-is', without any express or implied + ** warranty. In no event will the authors be held liable for any + ** damages arising from the use of this software. + ** Permission is granted to anyone to use this software for any + ** purpose, including commercial applications, and to alter it and + ** redistribute it freely, subject to the following restrictions: + ** + ** 1. The origin of this software must not be misrepresented; you + ** must not claim that you wrote the original software. If you + ** use this software in a product, an acknowledgment in the + ** use this software in a product, an acknowledgment in the + ** product documentation would be appreciated but is not + ** required. + ** + ** 2. Altered source versions must be plainly marked as such, and + ** must not be misrepresented as being the original software. + ** + ** 3. This notice may not be removed or altered from any source + ** distribution. + ** + ** + ** Description: Implementation of the standard library function memcpy. + ** This implementation of memcpy() is ANSI-C89 compatible. + ** + *******************************************************************/ + + +/******************************************************************** + ** Includes for size_t definition + *******************************************************************/ + +#include + + +/******************************************************************** + ** + ** void *memcpy(void *dest, const void *src, size_t count) + ** + ** Args: dest - pointer to destination buffer + ** src - pointer to source buffer + ** count - number of bytes to copy + ** + ** Return: A pointer to destination buffer + ** + ** Purpose: Copies count bytes from src to dest. No overlap check + ** is performed. + ** + *******************************************************************/ + +#ifdef __cplusplus +extern "C" { +#endif + +void *memcpy(void *dest, const void *src, size_t count); + +#ifdef __cplusplus +} +#endif Property changes on: branches/cparm/i386/modules/Libeg/memcpy.h ___________________________________________________________________ Added: svn:executable + * Index: branches/cparm/i386/modules/Libeg/tryme.c =================================================================== --- branches/cparm/i386/modules/Libeg/tryme.c (revision 2182) +++ branches/cparm/i386/modules/Libeg/tryme.c (revision 2183) @@ -32,6 +32,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* PLEASE SEE THE REAME */ + #include "libegint.h" #include #include @@ -546,7 +548,7 @@ if ((icnsImage = egDecodeICNS((UINT8 *)image->PixelData, image->Width * image->Height * 4, 128, TRUE))) { - EG_IMAGE_VIEW * iconeView = egCreateImageViewFromData((EG_PIXEL *)image->PixelData, image->Width, image->Height, TRUE , 20, 20, name16, TRUE); + EG_IMAGE_VIEW * iconeView = egCreateImageViewFromData((EG_PIXEL *)image->PixelData, image->Width, image->Height, TRUE , 40, 40, name16, TRUE); if (iconeView) { iconeRef = egViewAddImageView(screen, iconeView); @@ -648,6 +650,8 @@ } + egViewUpdate(screen); + getc(); egViewRemoveImageView(screen, ConsoleImageViewRef); /* @@ -691,9 +695,9 @@ uint32_t x2,y2; for (c = 0; c < 5; c++) { - if(gettimeofday(&earlier,NULL)) + if(gettimeofday(&earlier,NULL) != 0) { - assert(1); + exit(-1); } int inc = 1,count = 0; x = deviceView->PosX; @@ -786,22 +790,13 @@ } } - if(gettimeofday(&later,NULL)) + if(gettimeofday(&later,NULL) != 0) { - exit(1); + exit(-1); } - CHAR16 Destination[512]; - - SPrint ( - Destination, - sizeof(Destination), - L"animation %d took %lld microseconds to finish", c, - timeval_diff(NULL,&later,&earlier)); - - UINTN TextWidth; - + EG_POSITION pos ; pos.x = (screen_params[0] - MIN(LAYOUT_TEXT_WIDTH, screen_params[0])) /2; pos.y = (screen_params[1] - MIN(TEXT_LINE_HEIGHT, screen_params[1])) /2; @@ -814,13 +809,31 @@ assert(TextImageView); assert(TextImageView->Image); - MenuBackgroundPixel.a -=50; + //MenuBackgroundPixel.a -=50; egFillImage(TextImageView->Image, &MenuBackgroundPixel); // render the text + + CHAR16 Destination[512]; + + SPrint ( + Destination, + sizeof(Destination), + L"animation %d took %lld microseconds to finish", c, + timeval_diff(NULL,&later,&earlier)); + + /* + CHAR8 Destination8[512]; + snprintf(Destination8, sizeof(Destination8), "animation %d took %lld microseconds to finish", c, + timeval_diff(NULL,&later,&earlier)); + + AsciiStrToUnicodeStr(Destination8, Destination); + */ + /* + UINTN TextWidth; egMeasureText(Destination, &TextWidth, NULL); egRenderText(Destination, TextImageView->Image, (TextImageView->Image->Width - TextWidth) >> 1, 2); - + */ egViewAddImageView(screen, TextImageView); egFreeImageView(TextImageView); egViewUpdate(screen); @@ -937,9 +950,9 @@ } - getc(); + //getc(); - egViewRemoveImageViewByName(screen, L"plug_in_Icon", sizeof(L"plug_in_Icon")); + //egViewRemoveImageViewByName(screen, L"plug_in_Icon", sizeof(L"plug_in_Icon")); egViewUpdate(screen); getc(); Index: branches/cparm/i386/modules/Libeg/README =================================================================== --- branches/cparm/i386/modules/Libeg/README (revision 0) +++ branches/cparm/i386/modules/Libeg/README (revision 2183) @@ -0,0 +1,4 @@ +tryme.c will let you see what this framebuffer will be capable in the next future, it's composed of a suite of animations that should be fast enough to be smooth and eye candy on most systemes, +but it can be very slow on some machines. + +warning : the text renderer do not work for the moment, you will not be warned when an animation is finished up, so when it seems to be in pause just press any key to continue. \ No newline at end of file Index: branches/cparm/i386/modules/Libeg/egview.c =================================================================== --- branches/cparm/i386/modules/Libeg/egview.c (revision 2182) +++ branches/cparm/i386/modules/Libeg/egview.c (revision 2183) @@ -130,7 +130,7 @@ { memset(&earlier,0,sizeof(struct timeval)); - if(gettimeofday(&earlier,NULL)) + if(gettimeofday(&earlier,NULL) != 0) { ASSERT(FALSE); @@ -144,7 +144,7 @@ memset(&later,0,sizeof(struct timeval)); - if(gettimeofday(&later,NULL)) + if(gettimeofday(&later,NULL) != 0) { ASSERT(FALSE); Index: branches/cparm/i386/modules/Libeg/memcpy.c =================================================================== --- branches/cparm/i386/modules/Libeg/memcpy.c (revision 0) +++ branches/cparm/i386/modules/Libeg/memcpy.c (revision 2183) @@ -0,0 +1,346 @@ +/******************************************************************** + ** File: memcpy.c + ** + ** Copyright (C) 1999-2010 Daniel Vik + ** + ** This software is provided 'as-is', without any express or implied + ** warranty. In no event will the authors be held liable for any + ** damages arising from the use of this software. + ** Permission is granted to anyone to use this software for any + ** purpose, including commercial applications, and to alter it and + ** redistribute it freely, subject to the following restrictions: + ** + ** 1. The origin of this software must not be misrepresented; you + ** must not claim that you wrote the original software. If you + ** use this software in a product, an acknowledgment in the + ** use this software in a product, an acknowledgment in the + ** product documentation would be appreciated but is not + ** required. + ** + ** 2. Altered source versions must be plainly marked as such, and + ** must not be misrepresented as being the original software. + ** + ** 3. This notice may not be removed or altered from any source + ** distribution. + ** + ** + ** Description: Implementation of the standard library function memcpy. + ** This implementation of memcpy() is ANSI-C89 compatible. + ** + ** The following configuration options can be set: + ** + ** LITTLE_ENDIAN - Uses processor with little endian + ** addressing. Default is big endian. + ** + ** PRE_INC_PTRS - Use pre increment of pointers. + ** Default is post increment of + ** pointers. + ** + ** INDEXED_COPY - Copying data using array indexing. + ** Using this option, disables the + ** PRE_INC_PTRS option. + ** + ** MEMCPY_64BIT - Compiles memcpy for 64 bit + ** architectures + ** + ** + ** Best Settings: + ** + ** Intel x86: LITTLE_ENDIAN and INDEXED_COPY + ** + *******************************************************************/ + + + +/******************************************************************** + ** Configuration definitions. + *******************************************************************/ + +#define LITTLE_ENDIAN +#define INDEXED_COPY + + +/******************************************************************** + ** Includes for size_t definition + *******************************************************************/ + +#include + + +/******************************************************************** + ** Typedefs + *******************************************************************/ + +typedef unsigned char UInt8; +typedef unsigned short UInt16; +typedef unsigned int UInt32; +#ifdef _WIN32 +typedef unsigned __int64 UInt64; +#else +typedef unsigned long long UInt64; +#endif + +#ifdef MEMCPY_64BIT +typedef UInt64 UIntN; +#define TYPE_WIDTH 8L +#else +typedef UInt32 UIntN; +#define TYPE_WIDTH 4L +#endif + + +/******************************************************************** + ** Remove definitions when INDEXED_COPY is defined. + *******************************************************************/ + +#if defined (INDEXED_COPY) +#if defined (PRE_INC_PTRS) +#undef PRE_INC_PTRS +#endif /*PRE_INC_PTRS*/ +#endif /*INDEXED_COPY*/ + + + +/******************************************************************** + ** Definitions for pre and post increment of pointers. + *******************************************************************/ + +#if defined (PRE_INC_PTRS) + +#define START_VAL(x) (x)-- +#define INC_VAL(x) *++(x) +#define CAST_TO_U8(p, o) ((UInt8*)p + o + TYPE_WIDTH) +#define WHILE_DEST_BREAK (TYPE_WIDTH - 1) +#define PRE_LOOP_ADJUST - (TYPE_WIDTH - 1) +#define PRE_SWITCH_ADJUST + 1 + +#else /*PRE_INC_PTRS*/ + +#define START_VAL(x) +#define INC_VAL(x) *(x)++ +#define CAST_TO_U8(p, o) ((UInt8*)p + o) +#define WHILE_DEST_BREAK 0 +#define PRE_LOOP_ADJUST +#define PRE_SWITCH_ADJUST + +#endif /*PRE_INC_PTRS*/ + + + +/******************************************************************** + ** Definitions for endians + *******************************************************************/ + +#if defined (LITTLE_ENDIAN) + +#define SHL >> +#define SHR << + +#else /* LITTLE_ENDIAN */ + +#define SHL << +#define SHR >> + +#endif /* LITTLE_ENDIAN */ + + + +/******************************************************************** + ** Macros for copying words of different alignment. + ** Uses incremening pointers. + *******************************************************************/ + +#define CP_INCR() { \ + INC_VAL(dstN) = INC_VAL(srcN); \ +} + +#define CP_INCR_SH(shl, shr) { \ + dstWord = srcWord SHL shl; \ + srcWord = INC_VAL(srcN); \ + dstWord |= srcWord SHR shr; \ + INC_VAL(dstN) = dstWord; \ +} + + + +/******************************************************************** + ** Macros for copying words of different alignment. + ** Uses array indexes. + *******************************************************************/ + +#define CP_INDEX(idx) { \ + dstN[idx] = srcN[idx]; \ +} + +#define CP_INDEX_SH(x, shl, shr) { \ + dstWord = srcWord SHL shl; \ + srcWord = srcN[x]; \ + dstWord |= srcWord SHR shr; \ + dstN[x] = dstWord; \ +} + + + +/******************************************************************** + ** Macros for copying words of different alignment. + ** Uses incremening pointers or array indexes depending on + ** configuration. + *******************************************************************/ + +#if defined (INDEXED_COPY) + +#define CP(idx) CP_INDEX(idx) +#define CP_SH(idx, shl, shr) CP_INDEX_SH(idx, shl, shr) + +#define INC_INDEX(p, o) ((p) += (o)) + +#else /* INDEXED_COPY */ + +#define CP(idx) CP_INCR() +#define CP_SH(idx, shl, shr) CP_INCR_SH(shl, shr) + +#define INC_INDEX(p, o) + +#endif /* INDEXED_COPY */ + + +#define COPY_REMAINING(count) { \ + START_VAL(dst8); \ + START_VAL(src8); \ + \ + switch (count) { \ + case 7: INC_VAL(dst8) = INC_VAL(src8); \ + case 6: INC_VAL(dst8) = INC_VAL(src8); \ + case 5: INC_VAL(dst8) = INC_VAL(src8); \ + case 4: INC_VAL(dst8) = INC_VAL(src8); \ + case 3: INC_VAL(dst8) = INC_VAL(src8); \ + case 2: INC_VAL(dst8) = INC_VAL(src8); \ + case 1: INC_VAL(dst8) = INC_VAL(src8); \ + case 0: \ + default: break; \ + } \ +} + +#define COPY_NO_SHIFT() { \ + UIntN* dstN = (UIntN*)(dst8 PRE_LOOP_ADJUST); \ + UIntN* srcN = (UIntN*)(src8 PRE_LOOP_ADJUST); \ + size_t length = count / TYPE_WIDTH; \ + \ + while (length & 7) { \ + CP_INCR(); \ + length--; \ + } \ + \ + length /= 8; \ + \ + while (length--) { \ + CP(0); \ + CP(1); \ + CP(2); \ + CP(3); \ + CP(4); \ + CP(5); \ + CP(6); \ + CP(7); \ + \ + INC_INDEX(dstN, 8); \ + INC_INDEX(srcN, 8); \ + } \ + \ + src8 = CAST_TO_U8(srcN, 0); \ + dst8 = CAST_TO_U8(dstN, 0); \ + \ + COPY_REMAINING(count & (TYPE_WIDTH - 1)); \ + \ + return dest; \ +} + + + +#define COPY_SHIFT(shift) { \ + UIntN* dstN = (UIntN*)((((UIntN)dst8) PRE_LOOP_ADJUST) & \ + ~(TYPE_WIDTH - 1)); \ + UIntN* srcN = (UIntN*)((((UIntN)src8) PRE_LOOP_ADJUST) & \ + ~(TYPE_WIDTH - 1)); \ + size_t length = count / TYPE_WIDTH; \ + UIntN srcWord = INC_VAL(srcN); \ + UIntN dstWord; \ + \ + while (length & 7) { \ + CP_INCR_SH(8 * shift, 8 * (TYPE_WIDTH - shift)); \ + length--; \ + } \ + \ + length /= 8; \ + \ + while (length--) { \ + CP_SH(0, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(1, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(2, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(3, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(4, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(5, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(6, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + CP_SH(7, 8 * shift, 8 * (TYPE_WIDTH - shift)); \ + \ + INC_INDEX(dstN, 8); \ + INC_INDEX(srcN, 8); \ + } \ + \ + src8 = CAST_TO_U8(srcN, (shift - TYPE_WIDTH)); \ + dst8 = CAST_TO_U8(dstN, 0); \ + \ + COPY_REMAINING(count & (TYPE_WIDTH - 1)); \ + \ + return dest; \ +} + + +/******************************************************************** + ** + ** void *memcpy(void *dest, const void *src, size_t count) + ** + ** Args: dest - pointer to destination buffer + ** src - pointer to source buffer + ** count - number of bytes to copy + ** + ** Return: A pointer to destination buffer + ** + ** Purpose: Copies count bytes from src to dest. + ** No overlap check is performed. + ** + *******************************************************************/ + +void *memcpy(void *dest, const void *src, size_t count) +{ + UInt8* dst8 = (UInt8*)dest; + UInt8* src8 = (UInt8*)src; + + if (count < 8) { + COPY_REMAINING(count); + return dest; + } + + START_VAL(dst8); + START_VAL(src8); + + while (((UIntN)dst8 & (TYPE_WIDTH - 1)) != WHILE_DEST_BREAK) { + INC_VAL(dst8) = INC_VAL(src8); + count--; + } + + switch ((((UIntN)src8) PRE_SWITCH_ADJUST) & (TYPE_WIDTH - 1)) { + case 0: COPY_NO_SHIFT(); break; + case 1: COPY_SHIFT(1); break; + case 2: COPY_SHIFT(2); break; + case 3: COPY_SHIFT(3); break; +#if TYPE_WIDTH > 4 + case 4: COPY_SHIFT(4); break; + case 5: COPY_SHIFT(5); break; + case 6: COPY_SHIFT(6); break; + case 7: COPY_SHIFT(7); break; +#endif + } + return dest; + +} Property changes on: branches/cparm/i386/modules/Libeg/memcpy.c ___________________________________________________________________ Added: svn:executable + * Index: branches/cparm/i386/modules/Libc/stdlib/exit.c =================================================================== --- branches/cparm/i386/modules/Libc/stdlib/exit.c (revision 2182) +++ branches/cparm/i386/modules/Libc/stdlib/exit.c (revision 2183) @@ -49,6 +49,7 @@ exit(status) int status; { + __cxa_finalize(NULL); if (__cleanup) (*__cleanup)();