Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
ffabaec1
Commit
ffabaec1
authored
Aug 09, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: mad: import debian patch for thumb2
parent
44488d6d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
2 deletions
+37
-2
contrib/src/mad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
...c/mad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
+34
-0
contrib/src/mad/rules.mak
contrib/src/mad/rules.mak
+3
-2
No files found.
contrib/src/mad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
0 → 100644
View file @
ffabaec1
From: Dave Martin
Subject: "rsc" doesnt exist anymore in thumb2
diff --git a/fixed.h b/fixed.h
index 4b58abf..ba4bc26 100644
--- a/fixed.h
+++ b/fixed.h
@@ -275,12 +275,25 @@
mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
: "+r" (lo), "+r" (hi) \
: "%r" (x), "r" (y))
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+ operand. If needed this code can also support Thumb-1
+ (simply append "s" to the end of the second two instructions). */
+# define MAD_F_MLN(hi, lo) \
+ asm ("rsbs %0, %0, #0\n\t" \
+ "sbc %1, %1, %1\n\t" \
+ "sub %1, %1, %2" \
+ : "+&r" (lo), "=&r" (hi) \
+ : "r" (hi) \
+ : "cc")
+#else /* ! __thumb__ */
# define MAD_F_MLN(hi, lo) \
asm ("rsbs %0, %2, #0\n\t" \
"rsc %1, %3, #0" \
- : "=r" (lo), "=r" (hi) \
+ : "=&r" (lo), "=r" (hi) \
: "0" (lo), "1" (hi) \
: "cc")
+#endif /* __thumb__ */
# define mad_f_scale64(hi, lo) \
({ mad_fixed_t __result; \
contrib/src/mad/rules.mak
View file @
ffabaec1
...
...
@@ -25,15 +25,16 @@ ifdef HAVE_IOS
$(APPLY)
$(SRC)
/mad/mad-ios-asm.patch
endif
$(APPLY)
$(SRC)
/mad/mad-noopt.patch
$(APPLY)
$(SRC)
/mad/Provide-Thumb-2-alternative-code-for-MAD_F_MLN.diff
$(MOVE)
.mad
:
libmad
touch
libmad/NEWS libmad/AUTHORS libmad/ChangeLog
$(RECONF)
ifdef
HAVE_IOS
cd
$<
&&
$(HOSTVARS)
CCAS
=
"
$(AS)
"
CFLAGS
=
"
$(CFLAGS)
-O4
-marm
$(NOTHUMB)
"
./configure
$(HOSTCONF)
$(MAD_CONF)
cd
$<
&&
$(HOSTVARS)
CCAS
=
"
$(AS)
"
CFLAGS
=
"
$(CFLAGS)
-O4"
./configure
$(HOSTCONF)
$(MAD_CONF)
else
cd
$<
&&
$(HOSTVARS)
CFLAGS
=
"
$(CFLAGS)
-O3
$(NOTHUMB)
"
./configure
$(HOSTCONF)
$(MAD_CONF)
cd
$<
&&
$(HOSTVARS)
CFLAGS
=
"
$(CFLAGS)
-O3"
./configure
$(HOSTCONF)
$(MAD_CONF)
endif
cd
$<
&&
$(MAKE)
install
touch
$@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment