September 2009 - netsurf-commits - listmaster.pepperfish.net

r9591 jmb - /trunk/libnspng/src/pngread.c

by netsurf＠semichrome.net

Author: jmb Date: Thu Sep 17 11:16:39 2009 New Revision: 9591 URL: http://source.netsurf-browser.org?rev=9591&view=rev Log: Change image data reallocation strategy. Seriously improves performance with huge image data. Modified: trunk/libnspng/src/pngread.c Modified: trunk/libnspng/src/pngread.c URL: http://source.netsurf-browser.org/trunk/libnspng/src/pngread.c?rev=9591&r... ============================================================================== --- trunk/libnspng/src/pngread.c (original) +++ trunk/libnspng/src/pngread.c Thu Sep 17 11:16:39 2009 @@ -541,24 +541,25 @@ } } - if (max_idx + 1 > bps) { + if (max_idx + 1 > bps) { + const uint32_t required_size = image->data_len + bps; uint8_t *temp; uint32_t written; /* Create/extend image buffer */ -#define OUTPUT_CHUNK_SIZE (16*1024) - while (image->data_len + bps > image->data_alloc) { - temp = ctx->alloc(image->data, - image->data_alloc + OUTPUT_CHUNK_SIZE, - ctx->pw); + if (required_size > image->data_alloc) { + /* Allocate an extra 12.5% to avoid heap thrashing */ + const uint32_t new_size = required_size + + (required_size / 8); + + temp = ctx->alloc(image->data, new_size, ctx->pw); if (temp == NULL) { return NSPNG_NOMEM; } image->data = temp; - image->data_alloc += OUTPUT_CHUNK_SIZE; - } -#undef OUTPUT_CHUNK_SIZE + image->data_alloc = new_size; + } /* Compress scanline into buffer */ written = lzf_compress(src_scanline,

13 years, 6 months

1
0
0 / 0

r9590 jmb - /trunk/libnspng/test/pngread.c

by netsurf＠semichrome.net

Author: jmb Date: Thu Sep 17 09:53:51 2009 New Revision: 9590 URL: http://source.netsurf-browser.org?rev=9590&view=rev Log: Actually draw image Modified: trunk/libnspng/test/pngread.c Modified: trunk/libnspng/test/pngread.c URL: http://source.netsurf-browser.org/trunk/libnspng/test/pngread.c?rev=9590&... ============================================================================== --- trunk/libnspng/test/pngread.c (original) +++ trunk/libnspng/test/pngread.c Thu Sep 17 09:53:51 2009 @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef __riscos__ #include <swis.h> @@ -21,6 +22,38 @@ static nspng_error row_handler(const uint8_t *row, uint32_t rowbytes, uint32_t rownum, int pass, void *pw) { +#ifdef __riscos__ + static uint8_t *screenbase; + static uint32_t screen_x; + static uint32_t screen_y; + + /* NOTE: This assumes that the screen is 32bpp */ + + /* First time round, find the base address of the screen */ + if (screenbase == NULL) { + uint32_t vdu_vars[] = { 11, 12, 148, -1 }; + + _swix(OS_ReadVduVariables, _INR(0,1), vdu_vars, vdu_vars); + + /* Screen scanline width, in bytes */ + screen_x = (vdu_vars[0] + 1) * 4; + /* Screen height, in scanlines */ + screen_y = vdu_vars[1] + 1; + screenbase = (uint8_t *) vdu_vars[2]; + } + + /* Only draw this row if it fits on the screen */ + if (rownum < screen_y) { + /* Clamp number of bytes to write to min(rowbytes, screen_x) */ + const uint32_t bytes_to_write = + rowbytes < screen_x ? rowbytes : screen_x; + /* Compute base address of scanline to output to */ + uint8_t *screenrow = screenbase + (rownum * screen_x); + + /* Draw it */ + memcpy(screenrow, row, bytes_to_write); + } +#endif // uint32_t col; UNUSED(row);

13 years, 6 months

1
0
0 / 0

r9589 tlsa - in /trunk/libnspng/test/data/photo: ./ edinburgh.png technic.png

by netsurf＠semichrome.net

Author: tlsa Date: Thu Sep 17 08:05:05 2009 New Revision: 9589 URL: http://source.netsurf-browser.org?rev=9589&view=rev Log: A couple of photos. Added: trunk/libnspng/test/data/photo/ trunk/libnspng/test/data/photo/edinburgh.png (with props) trunk/libnspng/test/data/photo/technic.png (with props) Added: trunk/libnspng/test/data/photo/edinburgh.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/photo/edinburg... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/photo/edinburgh.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/photo/technic.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/photo/technic.... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/photo/technic.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

13 years, 6 months

1
0
0 / 0

r9588 jmb - /trunk/libnspng/test/pngread.c

by netsurf＠semichrome.net

Author: jmb Date: Thu Sep 17 07:38:00 2009 New Revision: 9588 URL: http://source.netsurf-browser.org?rev=9588&view=rev Log: Calculate percentage relative to 32bpp buffer, rather than uncompressed source data. Modified: trunk/libnspng/test/pngread.c Modified: trunk/libnspng/test/pngread.c URL: http://source.netsurf-browser.org/trunk/libnspng/test/pngread.c?rev=9588&... ============================================================================== --- trunk/libnspng/test/pngread.c (original) +++ trunk/libnspng/test/pngread.c Thu Sep 17 07:38:00 2009 @@ -121,14 +121,14 @@ fseek(fp, 0, SEEK_END); long fsize = ftell(fp); - full += ctx->image.height * ctx->image.bytes_per_scanline; + full += ctx->image.height * ctx->image.width * 4; comp += ctx->image.data_len; printf("%s: %lu (%u) -> %u = %.2f%%\n", argv[i], fsize, - ctx->image.height * ctx->image.bytes_per_scanline, + ctx->image.height * ctx->image.width * 4, ctx->image.data_len, (float) ctx->image.data_len * 100 / - (float) (ctx->image.height * ctx->image.bytes_per_scanline)); + (float) (ctx->image.height * ctx->image.width * 4)); nspng_ctx_destroy(ctx);

13 years, 6 months

1
0
0 / 0

r9587 jmb - /trunk/libnspng/Makefile

by netsurf＠semichrome.net

Author: jmb Date: Thu Sep 17 07:37:20 2009 New Revision: 9587 URL: http://source.netsurf-browser.org?rev=9587&view=rev Log: Rice Modified: trunk/libnspng/Makefile Modified: trunk/libnspng/Makefile URL: http://source.netsurf-browser.org/trunk/libnspng/Makefile?rev=9587&r1=958... ============================================================================== --- trunk/libnspng/Makefile (original) +++ trunk/libnspng/Makefile Thu Sep 17 07:37:20 2009 @@ -14,6 +14,7 @@ ifneq ($(GCCVER),2) WARNFLAGS := $(WARNFLAGS) -Wextra endif + CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) ifneq ($(GCCVER),2) @@ -22,6 +23,9 @@ # __inline__ is a GCCism CFLAGS := $(CFLAGS) -Dinline="__inline__" endif + +# Make rendering faster +CFLAGS := $(CFLAGS) -funroll-loops # Zlib ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)

13 years, 6 months

1
0
0 / 0

r9586 tlsa - in /trunk/libnspng/test/data/apng: ./ NetSurfThrobber.png

by netsurf＠semichrome.net

Author: tlsa Date: Thu Sep 17 06:37:23 2009 New Revision: 9586 URL: http://source.netsurf-browser.org?rev=9586&view=rev Log: An apng test file. Added: trunk/libnspng/test/data/apng/ trunk/libnspng/test/data/apng/NetSurfThrobber.png (with props) Added: trunk/libnspng/test/data/apng/NetSurfThrobber.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/apng/NetSurfTh... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/apng/NetSurfThrobber.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

13 years, 6 months

1
0
0 / 0

r9585 jmb - /trunk/libnspng/src/pngread.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Sep 16 12:05:54 2009 New Revision: 9585 URL: http://source.netsurf-browser.org?rev=9585&view=rev Log: Make read_chunk less braindead. Modified: trunk/libnspng/src/pngread.c Modified: trunk/libnspng/src/pngread.c URL: http://source.netsurf-browser.org/trunk/libnspng/src/pngread.c?rev=9585&r... ============================================================================== --- trunk/libnspng/src/pngread.c (original) +++ trunk/libnspng/src/pngread.c Wed Sep 16 12:05:54 2009 @@ -95,88 +95,115 @@ /** * Read a chunk from the data stream * - * \param ctx Decoder context + * \param ctx Decoder context * \param data Start of chunk to read * \param len Length, in bytes, of available data * \return NSPNG_OK on success. */ static nspng_error read_chunk(nspng_ctx *ctx, const uint8_t *data, size_t len) { + nspng_error error = NSPNG_OK; + nspng_chunk_state chunk_state; + nspng_chunk chunk; + assert(ctx != NULL); assert(data != NULL); - while (len > 0 && ctx->chunk_state != CHUNK_STATE_HAD_CRC) { - ctx->chunk.amount_read++; - - if (ctx->chunk_state == CHUNK_STATE_START) { - ctx->chunk.length = (ctx->chunk.length << 8) | *data; - - if (ctx->chunk.amount_read == 4) { + chunk_state = ctx->chunk_state; + chunk = ctx->chunk; + + while (len > 0 && chunk_state != CHUNK_STATE_HAD_CRC) { + if (chunk_state == CHUNK_STATE_START) { + chunk.length = (chunk.length << 8) | *data; + + if (++chunk.amount_read == 4) { /* Length should not exceed 2^31 - 1 bytes */ - if (ctx->chunk.length > 0x7fffffff) { - return NSPNG_INVALID; + if (chunk.length > 0x7fffffff) { + error = NSPNG_INVALID; + break; } /* Initialise CRC */ - ctx->chunk.computed_crc = crc32(0L, Z_NULL, 0); - - ctx->chunk_state = CHUNK_STATE_HAD_LENGTH; + chunk.computed_crc = crc32(0L, Z_NULL, 0); + + chunk_state = CHUNK_STATE_HAD_LENGTH; } - } else if (ctx->chunk_state == CHUNK_STATE_HAD_LENGTH) { - ctx->chunk.type = (ctx->chunk.type << 8) | *data; + + data++; + len--; + } else if (chunk_state == CHUNK_STATE_HAD_LENGTH) { + chunk.type = (chunk.type << 8) | *data; /* CRC includes chunk type */ - ctx->chunk.computed_crc = crc32( - ctx->chunk.computed_crc, data, 1); - - if (ctx->chunk.amount_read == 8) { - if (ctx->chunk.length > ctx->chunk.data_alloc) { + chunk.computed_crc = crc32(chunk.computed_crc, data, 1); + + if (++chunk.amount_read == 8) { + if (chunk.length > chunk.data_alloc) { uint8_t *temp = ctx->alloc( - ctx->chunk.data, - ctx->chunk.length, + chunk.data, + chunk.length, ctx->pw); - if (temp == NULL) - return NSPNG_NOMEM; - - ctx->chunk.data = temp; - ctx->chunk.data_alloc = - ctx->chunk.length; + if (temp == NULL) { + error = NSPNG_NOMEM; + break; + } + + chunk.data = temp; + chunk.data_alloc = chunk.length; } - if (ctx->chunk.length == 0) { - ctx->chunk_state = CHUNK_STATE_HAD_DATA; + if (chunk.length == 0) { + chunk_state = CHUNK_STATE_HAD_DATA; } else { - ctx->chunk_state = CHUNK_STATE_HAD_TYPE; + chunk_state = CHUNK_STATE_HAD_TYPE; } } - } else if (ctx->chunk_state == CHUNK_STATE_HAD_TYPE) { - ctx->chunk.data[ctx->chunk.amount_read - 9] = *data; - - ctx->chunk.computed_crc = crc32( - ctx->chunk.computed_crc, data, 1); - - if (ctx->chunk.amount_read == ctx->chunk.length + 8) { - ctx->chunk_state = CHUNK_STATE_HAD_DATA; + + data++; + len--; + } else if (chunk_state == CHUNK_STATE_HAD_TYPE) { + const uint32_t needed = + chunk.length - (chunk.amount_read - 8); + const uint32_t bytes = needed < len ? needed : len; + + memcpy(chunk.data + chunk.amount_read - 8, data, bytes); + + chunk.computed_crc = crc32(chunk.computed_crc, data, + bytes); + + if (chunk.amount_read + bytes == chunk.length + 8) { + chunk_state = CHUNK_STATE_HAD_DATA; } - } else if (ctx->chunk_state == CHUNK_STATE_HAD_DATA) { - ctx->chunk.crc = (ctx->chunk.crc << 8) | *data; - - if (ctx->chunk.amount_read == ctx->chunk.length + 12) { + + chunk.amount_read += bytes; + + data += bytes; + len -= bytes; + } else if (chunk_state == CHUNK_STATE_HAD_DATA) { + chunk.crc = (chunk.crc << 8) | *data; + + if (++chunk.amount_read == chunk.length + 12) { /* Ensure CRCs match */ - if (ctx->chunk.computed_crc != ctx->chunk.crc) { - return NSPNG_INVALID; + if (chunk.computed_crc != chunk.crc) { + error = NSPNG_INVALID; + break; } - ctx->chunk_state = CHUNK_STATE_HAD_CRC; + chunk_state = CHUNK_STATE_HAD_CRC; } - } - - data++; - len--; - } - - return (ctx->chunk_state == CHUNK_STATE_HAD_CRC) ? NSPNG_OK - : NSPNG_NEEDDATA; + + data++; + len--; + } + } + + ctx->chunk = chunk; + ctx->chunk_state = chunk_state; + + if (error == NSPNG_OK && ctx->chunk_state != CHUNK_STATE_HAD_CRC) + error = NSPNG_NEEDDATA; + + return error; } static nspng_error process_ihdr(nspng_ctx *ctx)

13 years, 6 months

1
0
0 / 0

r9584 jmb - /trunk/libnspng/test/pngread.c

by netsurf＠semichrome.net

Author: jmb Date: Wed Sep 16 12:05:23 2009 New Revision: 9584 URL: http://source.netsurf-browser.org?rev=9584&view=rev Log: Make buffer static -- profiling fails otherwise. Modified: trunk/libnspng/test/pngread.c Modified: trunk/libnspng/test/pngread.c URL: http://source.netsurf-browser.org/trunk/libnspng/test/pngread.c?rev=9584&... ============================================================================== --- trunk/libnspng/test/pngread.c (original) +++ trunk/libnspng/test/pngread.c Wed Sep 16 12:05:23 2009 @@ -45,7 +45,7 @@ int main(int argc, char **argv) { FILE *fp; - uint8_t buf[4096]; + static uint8_t buf[4096]; size_t read; nspng_ctx *ctx; nspng_rect clip;

13 years, 6 months

1
0
0 / 0

r9583 tlsa - /trunk/libnspng/test/data/various/

by netsurf＠semichrome.net

Author: tlsa Date: Wed Sep 16 10:29:10 2009 New Revision: 9583 URL: http://source.netsurf-browser.org?rev=9583&view=rev Log: More test files. Added: trunk/libnspng/test/data/various/8880.png (with props) trunk/libnspng/test/data/various/BioHazard.png (with props) trunk/libnspng/test/data/various/CogRISCOS.png (with props) trunk/libnspng/test/data/various/Emblem1.png (with props) trunk/libnspng/test/data/various/Emblem2.png (with props) trunk/libnspng/test/data/various/Emblem3.png (with props) trunk/libnspng/test/data/various/Planet.png (with props) trunk/libnspng/test/data/various/Quack.png (with props) trunk/libnspng/test/data/various/RadioButton.png (with props) trunk/libnspng/test/data/various/RainbowBlob.png (with props) trunk/libnspng/test/data/various/RedStar.png (with props) trunk/libnspng/test/data/various/Tile1.png (with props) trunk/libnspng/test/data/various/Tile2.png (with props) trunk/libnspng/test/data/various/k2acorn.png (with props) trunk/libnspng/test/data/various/maze.png (with props) trunk/libnspng/test/data/various/oldflyer.png (with props) trunk/libnspng/test/data/various/picodrive.png (with props) trunk/libnspng/test/data/various/red.png (with props) trunk/libnspng/test/data/various/sonicmoon.png (with props) Added: trunk/libnspng/test/data/various/8880.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/8880.p... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/8880.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/BioHazard.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/BioHaz... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/BioHazard.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/CogRISCOS.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/CogRIS... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/CogRISCOS.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Emblem1.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Emblem... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Emblem1.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Emblem2.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Emblem... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Emblem2.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Emblem3.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Emblem... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Emblem3.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Planet.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Planet... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Planet.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Quack.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Quack.... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Quack.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/RadioButton.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/RadioB... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/RadioButton.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/RainbowBlob.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Rainbo... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/RainbowBlob.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/RedStar.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/RedSta... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/RedStar.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Tile1.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Tile1.... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Tile1.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/Tile2.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/Tile2.... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/Tile2.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/k2acorn.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/k2acor... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/k2acorn.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/maze.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/maze.p... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/maze.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/oldflyer.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/oldfly... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/oldflyer.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/picodrive.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/picodr... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/picodrive.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/red.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/red.pn... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/red.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/libnspng/test/data/various/sonicmoon.png URL: http://source.netsurf-browser.org/trunk/libnspng/test/data/various/sonicm... ============================================================================== Binary file - no diff available. Propchange: trunk/libnspng/test/data/various/sonicmoon.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

13 years, 6 months

1
0
0 / 0

r9582 jmb - /trunk/tools/profile/src/profile.s

by netsurf＠semichrome.net

Author: jmb Date: Wed Sep 16 09:53:38 2009 New Revision: 9582 URL: http://source.netsurf-browser.org?rev=9582&view=rev Log: Fix AOF build Modified: trunk/tools/profile/src/profile.s Modified: trunk/tools/profile/src/profile.s URL: http://source.netsurf-browser.org/trunk/tools/profile/src/profile.s?rev=9... ============================================================================== --- trunk/tools/profile/src/profile.s (original) +++ trunk/tools/profile/src/profile.s Wed Sep 16 09:53:38 2009 @@ -12,16 +12,16 @@ EXPORT __cyg_profile_func_enter EXPORT __cyg_profile_func_exit - @; Standard C Functions + ;@ Standard C Functions IMPORT atexit IMPORT exit IMPORT malloc IMPORT memset - @; In profc.c + ;@ In profc.c IMPORT profile_save - @; Generated by Linker + ;@ Generated by Linker IMPORT |Image$$RO$$Base| IMPORT |Image$$RO$$Limit| #else @@ -36,14 +36,14 @@ .section ".text" #endif -@; Function entry handler -@; -@; On Entry: -@; r0 -> function -@; r1 -> call site -@; -@; On Exit: -@; r0-r3 corrupt +;@ Function entry handler +;@ +;@ On Entry: +;@ r0 -> function +;@ r1 -> call site +;@ +;@ On Exit: +;@ r0-r3 corrupt #if defined(__aof__) __cyg_profile_func_enter @@ -54,35 +54,35 @@ __cyg_profile_func_enter: #endif STMFD sp!,{r4-r8,lr} - MOV r4,r0 @; preserve function pointer - - LDR r1,initialised @; initialise, if necessary + MOV r4,r0 ;@ preserve function pointer + + LDR r1,initialised ;@ initialise, if necessary TEQ r1,#0 BLEQ profile_init - MRC P14,0,a1,C1,C0,0 @; read CCNT + MRC P14,0,a1,C1,C0,0 ;@ read CCNT ADR r5,stack_base LDMIA r5,{r5-r8} TEQ r5,r6 #if defined(__aof__) - BEQ %FT01 @; stack empty -#else - BEQ 1f @; stack empty -#endif - - LDR r1,[r6,#-8] @; r1 -> caller's profile blk - - @; update caller's exclusive time + BEQ %FT01 ;@ stack empty +#else + BEQ 1f ;@ stack empty +#endif + + LDR r1,[r6,#-8] ;@ r1 -> caller's profile blk + + ;@ update caller's exclusive time LDR r2,[r1,#exclusive_time] LDR r3,[r1,#exclusive_time + 4] - CMP r0,r8 @; wrapped around? + CMP r0,r8 ;@ wrapped around? MOVLO r5,#-1 - SUBLO r5,r5,r8 @; diff = UINT_MAX - last - ADDLO r5,r5,r0 @; diff += now - SUBHS r5,r0,r8 @; diff = last - now + SUBLO r5,r5,r8 ;@ diff = UINT_MAX - last + ADDLO r5,r5,r0 ;@ diff += now + SUBHS r5,r0,r8 ;@ diff = last - now ADDS r2,r2,r5 ADC r3,r3,#0 STR r2,[r1,#exclusive_time] @@ -98,25 +98,25 @@ CMP r4,r1 CMPGT r2,r4 #if defined(__aof__) - BLE %FT02 @; address out of bounds -#else - BLE 2f @; address out of bounds -#endif - - SUB r4,r4,r1 @; get offset into table + BLE %FT02 ;@ address out of bounds +#else + BLE 2f ;@ address out of bounds +#endif + + SUB r4,r4,r1 ;@ get offset into table ADD r4,r4,r7 LDR r1,[r4] - TEQ r1,#0 @; create struct, if necessary + TEQ r1,#0 ;@ create struct, if necessary BLEQ profile_create - LDR r2,[r1,#fcc] @; increase call count + LDR r2,[r1,#fcc] ;@ increase call count ADD r2,r2,#1 STR r2,[r1,#fcc] - @; push onto call stack - - STR r1,[r6],#4 @; profile block pointer - STR r0,[r6],#4 @; time called + ;@ push onto call stack + + STR r1,[r6],#4 ;@ profile block pointer + STR r0,[r6],#4 ;@ time called STR r6,stackp #if defined(__aof__) @@ -128,14 +128,14 @@ LDMFD sp!,{r4-r8,pc} -@; Function exit handler -@; -@; On Entry: -@; r0 -> function -@; r1 -> call site -@; -@; On Exit: -@; r0-r3 corrupt +;@ Function exit handler +;@ +;@ On Entry: +;@ r0 -> function +;@ r1 -> call site +;@ +;@ On Exit: +;@ r0-r3 corrupt #if defined(__aof__) __cyg_profile_func_exit @@ -145,7 +145,7 @@ .type __cyg_profile_func_exit, %function __cyg_profile_func_exit: #endif - @; if (!initialised || stack empty) return; + ;@ if (!initialised || stack empty) return; LDR r1,initialised TEQ r1,#0 LDRNE r1,stack_base @@ -156,44 +156,44 @@ STMFD sp!,{r4-r8,lr} MOV r4,r0 - MRC P14,0,a1,C1,C0,0 @; read CCNT + MRC P14,0,a1,C1,C0,0 ;@ read CCNT LDR r5,ro_base LDR r6,ro_limit CMP r4,r5 CMPGT r6,r4 #if defined(__aof__) - BLE %FT01 @; address out of bounds -#else - BLE 1f @; address out of bounds + BLE %FT01 ;@ address out of bounds +#else + BLE 1f ;@ address out of bounds #endif ADR r5,stack_base LDMIA r5,{r5-r8} - LDR r1,[r6,#-4]! @; r1 = time function entered - LDR r2,[r6,#-4]! @; r2 -> profile block + LDR r1,[r6,#-4]! ;@ r1 = time function entered + LDR r2,[r6,#-4]! ;@ r2 -> profile block STR r6,stackp - LDMIB r2,{r3-r6} @; load times - - @; update exclusive - CMP r0,r8 @; wrapped around? + LDMIB r2,{r3-r6} ;@ load times + + ;@ update exclusive + CMP r0,r8 ;@ wrapped around? MOVLO r7,#-1 - SUBLO r7,r7,r8 @; diff = UINT_MAX - last - ADDLO r7,r7,r0 @; diff += now - SUBHS r7,r0,r8 @; diff = last - now + SUBLO r7,r7,r8 ;@ diff = UINT_MAX - last + ADDLO r7,r7,r0 ;@ diff += now + SUBHS r7,r0,r8 ;@ diff = last - now ADDS r3,r3,r7 ADC r4,r4,#0 - @; update inclusive - CMP r0,r1 @; wrapped around? + ;@ update inclusive + CMP r0,r1 ;@ wrapped around? MOVLO r7,#-1 - SUBLO r7,r7,r1 @; diff = UINT_MAX - last - ADDLO r7,r7,r0 @; diff += now - SUBHS r7,r0,r1 @; diff = last - now + SUBLO r7,r7,r1 ;@ diff = UINT_MAX - last + ADDLO r7,r7,r0 ;@ diff += now + SUBHS r7,r0,r1 ;@ diff = last - now ADDS r5,r5,r7 ADC r6,r6,#0 - STMIB r2,{r3-r6} @; save back + STMIB r2,{r3-r6} ;@ save back #if defined(__aof__) 01 @@ -201,18 +201,18 @@ 1: #endif - STR r0,last_called @; update last called and exit + STR r0,last_called ;@ update last called and exit LDMFD sp!,{r4-r8,pc} -@; Initialise the profiling code -@; Ensures ProfileMod is loaded and allocates memory for call stack etc. -@; -@; On Entry: -@; - -@; -@; On Exit: -@; r0-r3 corrupt +;@ Initialise the profiling code +;@ Ensures ProfileMod is loaded and allocates memory for call stack etc. +;@ +;@ On Entry: +;@ - +;@ +;@ On Exit: +;@ r0-r3 corrupt #if defined(__aof__) profile_init @@ -231,7 +231,7 @@ BVC 1f #endif - @;try to load the module + ;@try to load the module MOV r0,#1 ADR r1,profile_cmd @@ -244,26 +244,26 @@ #else 1: #endif - STR pc,initialised @; mark as initialised - - LDR a1,ro_base @; create table + STR pc,initialised ;@ mark as initialised + + LDR a1,ro_base ;@ create table LDR a2,ro_limit SUB a1,a2,a1 BL malloc TEQ a1,#0 - MOVEQ a1,#255 @; malloc failed + MOVEQ a1,#255 ;@ malloc failed BEQ exit STR a1,table_base LDR a2,ro_limit - LDR a3,ro_base @; zero-init table + LDR a3,ro_base ;@ zero-init table SUB a3,a2,a3 MOV a2,#0 BL memset - MOV a1,#4096 @; create call stack + MOV a1,#4096 ;@ create call stack BL malloc TEQ a1,#0 @@ -273,7 +273,7 @@ STR a1,stack_base STR a1,stackp - @; register exit handler + ;@ register exit handler ADR a1,profile_save_shim BL atexit @@ -290,11 +290,11 @@ #endif -@; On Entry: -@; r4 -> table entry -@; On Exit: -@; r1 -> block -@; table entry filled in +;@ On Entry: +;@ r4 -> table entry +;@ On Exit: +;@ r1 -> block +;@ table entry filled in #if defined(__aof__) profile_create @@ -308,7 +308,7 @@ BL malloc TEQ a1,#0 - MOVEQ a1,#255 @; malloc failed + MOVEQ a1,#255 ;@ malloc failed BEQ exit MOV r1,#0 @@ -324,13 +324,13 @@ LDMFD sp!,{r0,pc} -@; Shim for profile_save, filling in arguments as required -@; -@; On Entry: -@; - -@; -@; On Exit: -@; r0-r3 corrupt - exits through profile_save +;@ Shim for profile_save, filling in arguments as required +;@ +;@ On Entry: +;@ - +;@ +;@ On Exit: +;@ r0-r3 corrupt - exits through profile_save #if defined(__aof__) profile_save_shim @@ -347,7 +347,7 @@ B profile_save -@; Data +;@ Data #if defined(__aof__) initialised DCD 0

13 years, 6 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits September 2009