From: James Zern Date: Sat, 2 Mar 2013 21:42:41 +0000 (-0800) Subject: prefix vp8 asm_{com,dec,enc}_offsets files X-Git-Tag: v1.3.0~1176 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08348d9cabf6e6aad1ae805ec58d6aacaa1b33ce;p=libvpx prefix vp8 asm_{com,dec,enc}_offsets files make them symmetrical with the generated output and their vp9 counterparts Change-Id: I72cc97c4d33d713dff620a6d7cc25955266216fc --- diff --git a/build/make/Android.mk b/build/make/Android.mk index db0cebff5..cf6221017 100644 --- a/build/make/Android.mk +++ b/build/make/Android.mk @@ -112,12 +112,12 @@ endef # Use ads2gas script to convert from RVCT format to GAS format. This passes # puts the processed file under $(ASM_CNV_PATH). Local clean rule # to handle removing these -ASM_CNV_OFFSETS_DEPEND = $(ASM_CNV_PATH)/asm_com_offsets.asm +ASM_CNV_OFFSETS_DEPEND = $(ASM_CNV_PATH)/vp8_asm_com_offsets.asm ifeq ($(CONFIG_VP8_DECODER), yes) - ASM_CNV_OFFSETS_DEPEND += $(ASM_CNV_PATH)/asm_dec_offsets.asm + ASM_CNV_OFFSETS_DEPEND += $(ASM_CNV_PATH)/vp8_asm_dec_offsets.asm endif ifeq ($(CONFIG_VP8_ENCODER), yes) - ASM_CNV_OFFSETS_DEPEND += $(ASM_CNV_PATH)/asm_enc_offsets.asm + ASM_CNV_OFFSETS_DEPEND += $(ASM_CNV_PATH)/vp8_asm_enc_offsets.asm endif .PRECIOUS: %.asm.s @@ -190,19 +190,19 @@ clean: include $(BUILD_SHARED_LIBRARY) $(eval $(call asm_offsets_template,\ - $(ASM_CNV_PATH)/asm_com_offsets.asm, \ - $(LIBVPX_PATH)/vp8/common/asm_com_offsets.c)) + $(ASM_CNV_PATH)/vp8_asm_com_offsets.asm, \ + $(LIBVPX_PATH)/vp8/common/vp8_asm_com_offsets.c)) ifeq ($(CONFIG_VP8_DECODER), yes) $(eval $(call asm_offsets_template,\ - $(ASM_CNV_PATH)/asm_dec_offsets.asm, \ - $(LIBVPX_PATH)/vp8/decoder/asm_dec_offsets.c)) + $(ASM_CNV_PATH)/vp8_asm_dec_offsets.asm, \ + $(LIBVPX_PATH)/vp8/decoder/vp8_asm_dec_offsets.c)) endif ifeq ($(CONFIG_VP8_ENCODER), yes) $(eval $(call asm_offsets_template,\ - $(ASM_CNV_PATH)/asm_enc_offsets.asm, \ - $(LIBVPX_PATH)/vp8/encoder/asm_enc_offsets.c)) + $(ASM_CNV_PATH)/vp8_asm_enc_offsets.asm, \ + $(LIBVPX_PATH)/vp8/encoder/vp8_asm_enc_offsets.c)) endif ifeq ($(CONFIG_RUNTIME_CPU_DETECT),yes) diff --git a/build/make/Makefile b/build/make/Makefile index da7fb03a0..4ac5bcf1f 100644 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -377,7 +377,7 @@ ifneq ($(call enabled,DIST-SRCS),) DIST-SRCS-$(CONFIG_MSVS) += build/x86-msvs/yasm.rules DIST-SRCS-$(CONFIG_MSVS) += build/x86-msvs/obj_int_extract.bat DIST-SRCS-$(CONFIG_RVCT) += build/make/armlink_adapter.sh - # Include obj_int_extract if we use offsets from asm_*_offsets + # Include obj_int_extract if we use offsets from *_asm_*_offsets DIST-SRCS-$(ARCH_ARM)$(ARCH_X86)$(ARCH_X86_64) += build/make/obj_int_extract.c DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas.pl DIST-SRCS-$(ARCH_ARM) += build/make/ads2gas_apple.pl diff --git a/build/make/obj_int_extract.c b/build/make/obj_int_extract.c index f86cec2ac..1604b5e68 100644 --- a/build/make/obj_int_extract.c +++ b/build/make/obj_int_extract.c @@ -144,7 +144,7 @@ int parse_macho(uint8_t *base_buf, size_t sz) { /* Location of string is cacluated each time from the * start of the string buffer. On darwin the symbols * are prefixed by "_", so we bump the pointer by 1. - * The target value is defined as an int in asm_*_offsets.c, + * The target value is defined as an int in *_asm_*_offsets.c, * which is 4 bytes on all targets we currently use. */ if (bits == 32) { @@ -446,7 +446,7 @@ int parse_elf(uint8_t *buf, size_t sz, output_fmt_t mode) { if (strcmp(section_name, ".bss")) { if (sizeof(val) != sym.st_size) { /* The target value is declared as an int in - * asm_*_offsets.c, which is 4 bytes on all + * *_asm_*_offsets.c, which is 4 bytes on all * targets we currently use. Complain loudly if * this is not true. */ @@ -528,7 +528,7 @@ int parse_elf(uint8_t *buf, size_t sz, output_fmt_t mode) { if ((strcmp(section_name, ".bss"))) { if (sizeof(val) != sym.st_size) { /* The target value is declared as an int in - * asm_*_offsets.c, which is 4 bytes on all + * *_asm_*_offsets.c, which is 4 bytes on all * targets we currently use. Complain loudly if * this is not true. */ diff --git a/build/x86-msvs/obj_int_extract.bat b/build/x86-msvs/obj_int_extract.bat index 70b39f68a..47fef974c 100644 --- a/build/x86-msvs/obj_int_extract.bat +++ b/build/x86-msvs/obj_int_extract.bat @@ -14,10 +14,10 @@ obj_int_extract.exe rvds "vp9_asm_com_offsets.obj" > "vp9_asm_com_offsets.asm" obj_int_extract.exe rvds "vp9_asm_dec_offsets.obj" > "vp9_asm_dec_offsets.asm" obj_int_extract.exe rvds "vp9_asm_enc_offsets.obj" > "vp9_asm_enc_offsets.asm" -cl /I "./" /I "%1" /nologo /c "%1/vp8/common/asm_com_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/asm_dec_offsets.c" -cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/asm_enc_offsets.c" -obj_int_extract.exe rvds "asm_com_offsets.obj" > "vp8_asm_com_offsets.asm" -obj_int_extract.exe rvds "asm_dec_offsets.obj" > "vp8_asm_dec_offsets.asm" -obj_int_extract.exe rvds "asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" +cl /I "./" /I "%1" /nologo /c "%1/vp8/common/vp8_asm_com_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp8/decoder/vp8_asm_dec_offsets.c" +cl /I "./" /I "%1" /nologo /c "%1/vp8/encoder/vp8_asm_enc_offsets.c" +obj_int_extract.exe rvds "vp8_asm_com_offsets.obj" > "vp8_asm_com_offsets.asm" +obj_int_extract.exe rvds "vp8_asm_dec_offsets.obj" > "vp8_asm_dec_offsets.asm" +obj_int_extract.exe rvds "vp8_asm_enc_offsets.obj" > "vp8_asm_enc_offsets.asm" diff --git a/vp8/common/asm_com_offsets.c b/vp8/common/vp8_asm_com_offsets.c similarity index 100% rename from vp8/common/asm_com_offsets.c rename to vp8/common/vp8_asm_com_offsets.c diff --git a/vp8/decoder/asm_dec_offsets.c b/vp8/decoder/vp8_asm_dec_offsets.c similarity index 100% rename from vp8/decoder/asm_dec_offsets.c rename to vp8/decoder/vp8_asm_dec_offsets.c diff --git a/vp8/encoder/asm_enc_offsets.c b/vp8/encoder/vp8_asm_enc_offsets.c similarity index 100% rename from vp8/encoder/asm_enc_offsets.c rename to vp8/encoder/vp8_asm_enc_offsets.c diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk index 2f73420a5..cde2651b5 100644 --- a/vp8/vp8_common.mk +++ b/vp8/vp8_common.mk @@ -14,7 +14,6 @@ VP8_COMMON_SRCS-yes += common/ppflags.h VP8_COMMON_SRCS-yes += common/onyx.h VP8_COMMON_SRCS-yes += common/onyxd.h VP8_COMMON_SRCS-yes += common/alloccommon.c -VP8_COMMON_SRCS-yes += common/asm_com_offsets.c VP8_COMMON_SRCS-yes += common/blockd.c VP8_COMMON_SRCS-yes += common/coefupdateprobs.h VP8_COMMON_SRCS-yes += common/debugmodes.c @@ -67,6 +66,7 @@ VP8_COMMON_SRCS-yes += common/setupintrarecon.c VP8_COMMON_SRCS-yes += common/swapyv12buffer.c VP8_COMMON_SRCS-yes += common/variance_c.c VP8_COMMON_SRCS-yes += common/variance.h +VP8_COMMON_SRCS-yes += common/vp8_asm_com_offsets.c VP8_COMMON_SRCS-yes += common/vp8_entropymodedata.h @@ -193,6 +193,6 @@ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16_neon$ VP8_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp8_subpixelvariance16x16s_neon$(ASM) $(eval $(call asm_offsets_template,\ - vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/asm_com_offsets.c)) + vp8_asm_com_offsets.asm, $(VP8_PREFIX)common/vp8_asm_com_offsets.c)) $(eval $(call rtcd_h_template,vp8_rtcd,vp8/common/rtcd_defs.sh)) diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk index a77971eb5..7d1904aaf 100644 --- a/vp8/vp8cx.mk +++ b/vp8/vp8cx.mk @@ -24,7 +24,6 @@ VP8_CX_SRCS-yes += vp8cx.mk VP8_CX_SRCS-yes += vp8_cx_iface.c -VP8_CX_SRCS-yes += encoder/asm_enc_offsets.c VP8_CX_SRCS-yes += encoder/defaultcoefcounts.h VP8_CX_SRCS-yes += encoder/bitstream.c VP8_CX_SRCS-yes += encoder/boolhuff.c @@ -78,6 +77,7 @@ VP8_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c VP8_CX_SRCS-yes += encoder/temporal_filter.c VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.c VP8_CX_SRCS-$(CONFIG_MULTI_RES_ENCODING) += encoder/mr_dissim.h +VP8_CX_SRCS-yes += encoder/vp8_asm_enc_offsets.c ifeq ($(CONFIG_REALTIME_ONLY),yes) VP8_CX_SRCS_REMOVE-yes += encoder/firstpass.c @@ -121,4 +121,4 @@ endif VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes)) $(eval $(call asm_offsets_template,\ - vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/asm_enc_offsets.c)) + vp8_asm_enc_offsets.asm, $(VP8_PREFIX)encoder/vp8_asm_enc_offsets.c)) diff --git a/vp8/vp8dx.mk b/vp8/vp8dx.mk index 8be4c7ba5..c26f42d58 100644 --- a/vp8/vp8dx.mk +++ b/vp8/vp8dx.mk @@ -20,7 +20,6 @@ VP8_DX_SRCS-yes += vp8dx.mk VP8_DX_SRCS-yes += vp8_dx_iface.c -VP8_DX_SRCS-yes += decoder/asm_dec_offsets.c VP8_DX_SRCS-yes += decoder/dboolhuff.c VP8_DX_SRCS-yes += decoder/decodemv.c VP8_DX_SRCS-yes += decoder/decodframe.c @@ -36,8 +35,9 @@ VP8_DX_SRCS-yes += decoder/onyxd_int.h VP8_DX_SRCS-yes += decoder/treereader.h VP8_DX_SRCS-yes += decoder/onyxd_if.c VP8_DX_SRCS-$(CONFIG_MULTITHREAD) += decoder/threading.c +VP8_DX_SRCS-yes += decoder/vp8_asm_dec_offsets.c VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes)) $(eval $(call asm_offsets_template,\ - vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/asm_dec_offsets.c)) + vp8_asm_dec_offsets.asm, $(VP8_PREFIX)decoder/vp8_asm_dec_offsets.c))