From 3273c7b679df4d2f51adaee8ea5fec4ede6e4109 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 4 Feb 2011 16:38:40 -0500 Subject: [PATCH] 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 --- build/make/obj_int_extract.c | 2 +- libs.mk | 1 - .../{arm/vpx_asm_offsets.c => assembly_offsets.c} | 0 vp8/decoder/arm/detokenize.asm | 2 +- vp8/vp8_common.mk | 15 +++++++++------ .../arm/neon/vp8_vpxyv12_copyframe_func_neon.asm | 2 +- .../arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm | 2 +- .../neon/vp8_vpxyv12_copysrcframe_func_neon.asm | 2 +- .../neon/vp8_vpxyv12_extendframeborders_neon.asm | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) rename vp8/common/{arm/vpx_asm_offsets.c => assembly_offsets.c} (100%) diff --git a/build/make/obj_int_extract.c b/build/make/obj_int_extract.c index e01870f27..3c54b248f 100644 --- a/build/make/obj_int_extract.c +++ b/build/make/obj_int_extract.c @@ -590,7 +590,7 @@ int parse_coff(unsigned __int8 *buf, size_t sz) //log_msg("COFF: Symbol table at offset %u\n", symtab_ptr); //log_msg("COFF: raw data pointer ofset for section .data is %u\n", sectionrawdata_ptr); - fp = fopen("vpx_asm_offsets.asm", "w"); + fp = fopen("assembly_offsets.asm", "w"); if (fp == NULL) { diff --git a/libs.mk b/libs.mk index 9ded3945a..d966f3477 100644 --- a/libs.mk +++ b/libs.mk @@ -230,7 +230,6 @@ endif # # Add assembler dependencies for configuration and offsets # -#$(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm $(BUILD_PFX)vpx_asm_offsets.asm $(filter %.s.o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm $(filter %.asm.o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm diff --git a/vp8/common/arm/vpx_asm_offsets.c b/vp8/common/assembly_offsets.c similarity index 100% rename from vp8/common/arm/vpx_asm_offsets.c rename to vp8/common/assembly_offsets.c 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 diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index cf4762614..4ff9e2f6c 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -85,6 +85,9 @@ VP8_COMMON_SRCS-yes += common/swapyv12buffer.c VP8_COMMON_SRCS-yes += common/textblit.c VP8_COMMON_SRCS-yes += common/treecoder.c +# upcoming work to move this to CONFIG_OPTIMIZATIONS +VP8_COMMON_SRCS-$(ARCH_ARM) += common/assembly_offsets.c + VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/idct_x86.h VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/subpixel_x86.h VP8_COMMON_SRCS-$(ARCH_X86)$(ARCH_X86_64) += common/x86/recon_x86.h @@ -118,7 +121,6 @@ VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/bilinearfilter_arm.c VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/filter_arm.c VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/loopfilter_arm.c VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/reconintra_arm.c -VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/vpx_asm_offsets.c # common (armv6) VP8_COMMON_SRCS-$(HAVE_ARMV6) += common/arm/armv6/bilinearfilter_v6$(ASM) @@ -166,11 +168,12 @@ VP8_COMMON_SRCS-$(HAVE_ARMV7) += common/arm/neon/recon_neon.c # # Rule to extract assembly constants from C sources # +# upcoming work to move this to CONFIG_OPTIMIZATIONS ifeq ($(ARCH_ARM),yes) -vpx_asm_offsets.asm: obj_int_extract -vpx_asm_offsets.asm: $(VP8_PREFIX)common/arm/vpx_asm_offsets.c.o +assembly_offsets.asm: obj_int_extract +assembly_offsets.asm: $(VP8_PREFIX)common/assembly_offsets.c.o ./obj_int_extract rvds $< $(ADS2GAS) > $@ -OBJS-yes += $(VP8_PREFIX)common/arm/vpx_asm_offsets.c.o -CLEAN-OBJS += vpx_asm_offsets.asm -$(filter %$(ASM).o,$(OBJS-yes)): vpx_asm_offsets.asm +OBJS-yes += $(VP8_PREFIX)common/assembly_offsets.c.o +CLEAN-OBJS += assembly_offsets.asm +$(filter %$(ASM).o,$(OBJS-yes)): assembly_offsets.asm endif diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm index 24d46cbe5..6f32cf638 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm @@ -14,7 +14,7 @@ REQUIRE8 PRESERVE8 - INCLUDE vpx_asm_offsets.asm + INCLUDE assembly_offsets.asm AREA ||.text||, CODE, READONLY, ALIGN=2 diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm index 6534827d8..02374a5f6 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copyframeyonly_neon.asm @@ -16,7 +16,7 @@ REQUIRE8 PRESERVE8 - INCLUDE vpx_asm_offsets.asm + INCLUDE assembly_offsets.asm AREA ||.text||, CODE, READONLY, ALIGN=2 ;void vpxyv12_copy_frame_yonly(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc); diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm index dfc8db55c..5fdfb2189 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm @@ -14,7 +14,7 @@ REQUIRE8 PRESERVE8 - INCLUDE vpx_asm_offsets.asm + INCLUDE assembly_offsets.asm AREA ||.text||, CODE, READONLY, ALIGN=2 ;Note: This function is used to copy source data in src_buffer[i] at beginning of diff --git a/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm b/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm index e475b929b..ddbba8e26 100644 --- a/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm +++ b/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm @@ -14,7 +14,7 @@ REQUIRE8 PRESERVE8 - INCLUDE vpx_asm_offsets.asm + INCLUDE assembly_offsets.asm AREA ||.text||, CODE, READONLY, ALIGN=2 ;void vp8_yv12_extend_frame_borders_neon (YV12_BUFFER_CONFIG *ybf); -- 2.40.0