Skip to content

GitLab

Commit 5c69acca authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Bulk search & replace to use 8b headers. 

Highlighted that last_dc_val should have been a JCOEF * not an int *.
Still works - amazing!

Version 1.38, 1.35.2.1. Tagged as 'SprExtend-1_38-1_35_2_1'
parent ef7601ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3519 additions and 35 deletions
Sources/jdhuff
View file @ 5c69acca
......@@ -56,7 +56,7 @@ h_l RN 2 ; used in huff_decode - same as temp3
MACRO
HUFF_DECODE_SETUP $tbl
; set up the specific table pointers for ac or dc huff table
; $tbl is a HUFF_TBL*.
; $tbl is a JHUFF_TBL*.
ADD h_maxcode,$tbl,#huff_tbl_maxcode
ADD h_shortcut,$tbl,#huff_tbl_shortcut
ADD h_huffval,$tbl,#huff_tbl_huffval
......@@ -221,16 +221,15 @@ huff_decode_loop$lab
; --------------------------------------------------------------------
EXPORT asm_huff_decode_blocks
asm_huff_decode_blocks
;LOCAL void
;huff_decode_blocks (decompress_info_ptr cinfo, JBLOCK block,
; HUFF_TBL *dctbl, HUFF_TBL *actbl,
; QUANT_TBL_PTR quanttbl, int *last_dc_val, int nblocks)
;huff_decode_blocks (j_decompress_ptr cinfo, JBLOCK block,
; JHUFF_TBL *dctbl, JHUFF_TBL *actbl,
; JQUANT_TBL *quanttbl, JCOEF *last_dc_val, int nblocks)
; r0 = cinfo
; r1 = block pointer
; r2 = HUFF_TBL* dctbl
; r3 = HUFF_TBL* actbl
; [sp] = quanttbl
; [sp,#4] = int *last_dc_val
; r2 = JHUFF_TBL *dctbl
; r3 = JHUFF_TBL *actbl
; [sp,#0] = quanttbl
; [sp,#4] = JCOEF *last_dc_val
; [sp,#8] = int nblocks
; save registers
......@@ -283,7 +282,7 @@ huff_block_clear
huff_anotherblock ; loop round to here nblocks times
; Set up huffman decoding for the DC component.
LDR h_temp,[sp,#2*4] ; HUFF_TBL* dctbl (DC table pointer)
LDR h_temp,[sp,#2*4] ; JHUFF_TBL* dctbl (DC table pointer)
HUFF_DECODE_SETUP h_temp ; set maxcode,huffval,shortcut
; Handle the DC component
......@@ -310,7 +309,7 @@ huff_dc_0
; That's the DC value done.
; Set up huffman decoding for the AC components.
LDR h_temp,[sp,#3*4] ; HUFF_TBL* actbl (AC table pointer)
LDR h_temp,[sp,#3*4] ; JHUFF_TBL* actbl (AC table pointer)
HUFF_DECODE_SETUP h_temp ; set maxcode,huffval,shortcut
; The loop that does AC components, once round for each non-zero component.
......@@ -380,16 +379,15 @@ huff_zag_end
; --------------------------------------------------------------------
EXPORT asm_huff_skip_blocks
asm_huff_skip_blocks
;LOCAL void
;huff_skip_blocks (decompress_info_ptr cinfo, JBLOCK block,
; HUFF_TBL *dctbl, HUFF_TBL *actbl,
; QUANT_TBL_PTR quanttbl, int *last_dc_val, int nblocks)
;huff_skip_blocks (j_decompress_ptr cinfo, JBLOCK block,
; JHUFF_TBL *dctbl, JHUFF_TBL *actbl,
; JQUANT_TBL *quanttbl, JCOEF *last_dc_val, int nblocks)
; r0 = cinfo
; r1 = block pointer (UNUSED)
; r2 = HUFF_TBL* dctbl
; r3 = HUFF_TBL* actbl
; [sp] = quanttbl (UNUSED)
; [sp,#4] = int *last_dc_val
; r2 = JHUFF_TBL *dctbl
; r3 = JHUFF_TBL *actbl
; [sp,#0] = quanttbl (UNUSED)
; [sp,#4] = JCOEF *last_dc_val
; [sp,#8] = int nblocks
; This routine is very similar to huff_decode_blocks, except that
; we do not actually output the block - we simply skip forward that far
......@@ -415,7 +413,7 @@ asm_huff_skip_blocks
huff_skip_anotherblock ; loop round to here nblocks times
; Set up huffman decoding for the DC component.
LDR h_temp,[sp,#2*4] ; HUFF_TBL* dctbl (DC table pointer)
LDR h_temp,[sp,#2*4] ; JHUFF_TBL* dctbl (DC table pointer)
HUFF_DECODE_SETUP h_temp ; set maxcode,huffval,shortcut
; Handle the DC component
......@@ -435,7 +433,7 @@ huff_skip_dc_0
; That's the DC value done.
; Set up huffman decoding for the AC components.
LDR h_temp,[sp,#3*4] ; HUFF_TBL* actbl (AC table pointer)
LDR h_temp,[sp,#3*4] ; JHUFF_TBL* actbl (AC table pointer)
HUFF_DECODE_SETUP h_temp ; set maxcode,huffval,shortcut
; The loop that does AC components, once round for each non-zero component.
......
Sources/jrevdct
View file @ 5c69acca
......@@ -266,7 +266,7 @@ $rc._odd_shortcut
;; ------------------------------------------------------------------------
;; Test proc - procedure to do a 1-D DCT
;; ------------------------------------------------------------------------
;; extern void dct_1d(decompress_info_ptr cinfo, int *data);
;; extern void dct_1d(j_decompress_ptr cinfo, int *data);
;asm_dct_1_d
; STMDB sp!,{r0-r12,lr} ; save state
......@@ -290,7 +290,7 @@ $rc._odd_shortcut
; r2=count
EXPORT asm_j_rev_dct
asm_j_rev_dct ; extern void asm_j_rev_dct(decompress_info_ptr cinfo, DCTBLOCK data, int count);
asm_j_rev_dct ; extern void asm_j_rev_dct(j_decompress_ptr cinfo, JBLOCK data, int count);
CMP r2,#0 ; if count=0, do nothing
MOVLE pc,lr
......
VersionASM
View file @ 5c69acca
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.38"
Module_Version SETA 138
Module_MinorVersion SETS ""
Module_Date SETS "23 Dec 2010"
Module_ApplicationDate SETS "23-Dec-10"
Module_MinorVersion SETS "1.35.2.1"
Module_Date SETS "04 Jan 2011"
Module_ApplicationDate SETS "04-Jan-11"
Module_ComponentName SETS "SprExtend"
Module_ComponentPath SETS "mixed/RiscOS/Sources/Video/Render/SprExtend"
Module_FullVersion SETS "1.38"
Module_HelpVersion SETS "1.38 (23 Dec 2010)"
Module_FullVersion SETS "1.38 (1.35.2.1)"
Module_HelpVersion SETS "1.38 (04 Jan 2011) 1.35.2.1"
END
VersionNum
View file @ 5c69acca
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 1.38
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Dec 2010
#define Module_MinorVersion_CMHG 1.35.2.1
#define Module_Date_CMHG 04 Jan 2011
#define Module_MajorVersion "1.38"
#define Module_Version 138
#define Module_MinorVersion ""
#define Module_Date "23 Dec 2010"
#define Module_MinorVersion "1.35.2.1"
#define Module_Date "04 Jan 2011"
#define Module_ApplicationDate "23-Dec-10"
#define Module_ApplicationDate "04-Jan-11"
#define Module_ComponentName "SprExtend"
#define Module_ComponentPath "mixed/RiscOS/Sources/Video/Render/SprExtend"
#define Module_FullVersion "1.38"
#define Module_HelpVersion "1.38 (23 Dec 2010)"
#define Module_FullVersion "1.38 (1.35.2.1)"
#define Module_HelpVersion "1.38 (04 Jan 2011) 1.35.2.1"
#define Module_LibraryVersionInfo "1:38"
c/putscaled 0 → 100644
View file @ 5c69acca
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment