Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
349714fb
Commit
349714fb
authored
Apr 25, 2002
by
David Mosberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ia64: Fix merge errors in do_csum().
parent
03e4d592
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
arch/ia64/lib/do_csum.S
arch/ia64/lib/do_csum.S
+2
-1
No files found.
arch/ia64/lib/do_csum.S
View file @
349714fb
...
@@ -207,10 +207,10 @@ GLOBAL_ENTRY(do_csum)
...
@@ -207,10 +207,10 @@ GLOBAL_ENTRY(do_csum)
//
//
.
do_csum16
:
.
do_csum16
:
shr.u
count
=
count
,
1
//
we
do
16
bytes
per
loop
shr.u
count
=
count
,
1
//
we
do
16
bytes
per
loop
adds
count
=-
1
,
count
brp.loop.imp
1
f
,
2
f
brp.loop.imp
1
f
,
2
f
;;
;;
cmp.eq
p9
,
p10
=
r0
,
count
//
if
(
count
==
0
)
cmp.eq
p9
,
p10
=
r0
,
count
//
if
(
count
==
0
)
adds
count
=-
1
,
count
mov
ar
.
ec
=
PIPE_DEPTH
mov
ar
.
ec
=
PIPE_DEPTH
mov
carry1
=
r0
mov
carry1
=
r0
...
@@ -254,6 +254,7 @@ GLOBAL_ENTRY(do_csum)
...
@@ -254,6 +254,7 @@ GLOBAL_ENTRY(do_csum)
cmp.ltu
p6
,
p0
=
result1
[
0
],
result2
[
LOAD_LATENCY
+
1
]
cmp.ltu
p6
,
p0
=
result1
[
0
],
result2
[
LOAD_LATENCY
+
1
]
;;
;;
(
p6
)
adds
result1
[
0
]=
1
,
result1
[
0
]
(
p6
)
adds
result1
[
0
]=
1
,
result1
[
0
]
;;
.
do_csum_exit
:
.
do_csum_exit
:
//
//
//
now
fold
64
into
16
bits
taking
care
of
carry
//
now
fold
64
into
16
bits
taking
care
of
carry
...
...
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