Commit 3273c7b6 authored by Johann's avatar Johann

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
parent eaadfb58
......@@ -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)
{
......
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -14,7 +14,7 @@
REQUIRE8
PRESERVE8
INCLUDE vpx_asm_offsets.asm
INCLUDE assembly_offsets.asm
AREA ||.text||, CODE, READONLY, ALIGN=2
......
......@@ -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);
......
......@@ -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
......
......@@ -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);
......
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