From 3273c7b679df4d2f51adaee8ea5fec4ede6e4109 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 4 Feb 2011 16:38:40 -0500 Subject: move one of the offset files common/arm/vpx_asm_offsets moves up a level. prepare for muxing with encoder/arm/vpx_vp8_enc_asm_offsets Change-Id: I89a04a5235447e66571995c9d9b4b6edcb038e24 --- vp8/decoder/arm/detokenize.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vp8/decoder') diff --git a/vp8/decoder/arm/detokenize.asm b/vp8/decoder/arm/detokenize.asm index 45e068a9f..c1e3b69d5 100644 --- a/vp8/decoder/arm/detokenize.asm +++ b/vp8/decoder/arm/detokenize.asm @@ -13,7 +13,7 @@ AREA |.text|, CODE, READONLY ; name this block of code - INCLUDE vpx_asm_offsets.asm + INCLUDE assembly_offsets.asm l_qcoeff EQU 0 l_i EQU 4 -- cgit v1.2.3 From 40dcae9c2e55185f94dd9d02810bb0756adcce57 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 4 Feb 2011 17:44:31 -0500 Subject: clarify *_offsets.asm differences it's difficult to mux the *_offsets.c files because of header conflicts. make three instead, name them consistently and partititon the contents to allow building them as required. Change-Id: I8f9768c09279f934f44b6c5b0ec363f7943bb796 --- vp8/decoder/arm/detokenize.asm | 2 +- vp8/decoder/asm_dec_offsets.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 vp8/decoder/asm_dec_offsets.c (limited to 'vp8/decoder') diff --git a/vp8/decoder/arm/detokenize.asm b/vp8/decoder/arm/detokenize.asm index c1e3b69d5..0c164f191 100644 --- a/vp8/decoder/arm/detokenize.asm +++ b/vp8/decoder/arm/detokenize.asm @@ -13,7 +13,7 @@ AREA |.text|, CODE, READONLY ; name this block of code - INCLUDE assembly_offsets.asm + INCLUDE asm_dec_offsets.asm l_qcoeff EQU 0 l_i EQU 4 diff --git a/vp8/decoder/asm_dec_offsets.c b/vp8/decoder/asm_dec_offsets.c new file mode 100644 index 000000000..e485cb414 --- /dev/null +++ b/vp8/decoder/asm_dec_offsets.c @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2011 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + + +#include "vpx_ports/config.h" +#include + +#include "onyxd_int.h" + +#define DEFINE(sym, val) int sym = val; + +/* +#define BLANK() asm volatile("\n->" : : ) +*/ + +/* + * int main(void) + * { + */ + +DEFINE(detok_scan, offsetof(DETOK, scan)); +DEFINE(detok_ptr_block2leftabove, offsetof(DETOK, ptr_block2leftabove)); +DEFINE(detok_coef_tree_ptr, offsetof(DETOK, vp8_coef_tree_ptr)); +DEFINE(detok_teb_base_ptr, offsetof(DETOK, teb_base_ptr)); +DEFINE(detok_norm_ptr, offsetof(DETOK, norm_ptr)); +DEFINE(detok_ptr_coef_bands_x, offsetof(DETOK, ptr_coef_bands_x)); + +DEFINE(detok_A, offsetof(DETOK, A)); +DEFINE(detok_L, offsetof(DETOK, L)); + +DEFINE(detok_qcoeff_start_ptr, offsetof(DETOK, qcoeff_start_ptr)); +DEFINE(detok_current_bc, offsetof(DETOK, current_bc)); +DEFINE(detok_coef_probs, offsetof(DETOK, coef_probs)); +DEFINE(detok_eob, offsetof(DETOK, eob)); + +DEFINE(bool_decoder_user_buffer_end, offsetof(BOOL_DECODER, user_buffer_end)); +DEFINE(bool_decoder_user_buffer, offsetof(BOOL_DECODER, user_buffer)); +DEFINE(bool_decoder_value, offsetof(BOOL_DECODER, value)); +DEFINE(bool_decoder_count, offsetof(BOOL_DECODER, count)); +DEFINE(bool_decoder_range, offsetof(BOOL_DECODER, range)); + +DEFINE(tokenextrabits_min_val, offsetof(TOKENEXTRABITS, min_val)); +DEFINE(tokenextrabits_length, offsetof(TOKENEXTRABITS, Length)); + +//add asserts for any offset that is not supported by assembly code +//add asserts for any size that is not supported by assembly code +/* + * return 0; + * } + */ -- cgit v1.2.3