aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kostylev <michael.kostylev@gmail.com>2013-05-16 09:29:46 -0400
committerDiego Biurrun <diego@biurrun.de>2013-05-17 15:37:03 +0200
commit2768f7e4fef56f2d48b4593b78e953098d456582 (patch)
treed4f3fd31881ed0caaff8114a5d808a05dcbc25ed
parent259af1b92370b32f6d0b9a6de314db4b44c2481d (diff)
downloadffmpeg-2768f7e4fef56f2d48b4593b78e953098d456582.tar.gz
sparc: VIS mnemonics
Currently, if VIS is enabled by configure, it will also be enabled at run-time regardless of its support in the hardware. Thus, masking VIS usage as it is done in vis.h by constructing binary instructions is pointless. Using normal VIS mnemonics in inline assembly allows to take advantage of automatic register allocation, gets rid of register variables, which are unsupported by suncc for SPARC, and improves code readability. Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rw-r--r--libavcodec/sparc/vis.h36
1 files changed, 8 insertions, 28 deletions
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h
index 30dc166899..ff2fb9d2e9 100644
--- a/libavcodec/sparc/vis.h
+++ b/libavcodec/sparc/vis.h
@@ -150,12 +150,9 @@ static inline int vis_level(void)
#define vis_m2r_2(op,mem1,mem2,rd) \
__asm__ volatile (#op "\t[%0 + %1], %%f" #rd : : "r" (mem1), "r" (mem2) )
-static inline void vis_set_gsr(unsigned int _val)
+static inline void vis_set_gsr(unsigned int val)
{
- register unsigned int val __asm__("g1");
-
- val = _val;
- __asm__ volatile(".word 0xa7804000"
+ __asm__ volatile("mov %0,%%asr19"
: : "r" (val));
}
@@ -208,36 +205,19 @@ static inline void vis_set_gsr(unsigned int _val)
/* Alignment instructions. */
-static inline const void *vis_alignaddr(const void *_ptr)
+static inline const void *vis_alignaddr(const void *ptr)
{
- register const void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
+ __asm__ volatile("alignaddr %0, %%g0, %0"
: "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x18) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(1)));
+ : "0" (ptr));
return ptr;
}
-static inline void vis_alignaddr_g0(void *_ptr)
+static inline void vis_alignaddr_g0(void *ptr)
{
- register void *ptr __asm__("g1");
-
- ptr = _ptr;
-
- __asm__ volatile(".word %2"
- : "=&r" (ptr)
- : "0" (ptr),
- "i" (vis_opc_base | vis_opf(0x18) |
- vis_rs1_s(1) |
- vis_rs2_s(0) |
- vis_rd_s(0)));
+ __asm__ volatile("alignaddr %0, %%g0, %%g0"
+ : : "r" (ptr));
}
#define vis_faligndata(rs1,rs2,rd) vis_dd2d(0x48, rs1, rs2, rd)