← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/openjdk-7/oneiric-security

« back to all changes in this revision

Viewing changes to debian/patches/sparc-stubgenerator.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-10-17 16:22:48 UTC
  • mfrom: (1.3.11) (8.1.25 quantal)
  • Revision ID: package-import@ubuntu.com-20121017162248-steblyv2lnk2t951
Tags: 7u9-2.3.3-0ubuntu1~11.10.1
Build IcedTea7 2.3.3 for oneiric.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sparc-stubgenerator.diff
 
1
Author: Damien Raude-Morvan <drazzib@debian.org>
 
2
Description: Fix FTBFS on sparc on stubGenerator_sparc.cpp by using explicit class typedef.
 
3
 
 
4
--- openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp.orig       2012-02-15 08:26:53.000000000 +0000
 
5
+++ openjdk/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp    2012-02-26 10:26:11.000000000 +0000
 
6
@@ -1126,7 +1126,7 @@
 
7
                                               Label& L_loop, bool use_prefetch, bool use_bis);
 
8
 
 
9
   void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
 
10
-                          int iter_size, CopyLoopFunc copy_loop_func) {
 
11
+                          int iter_size, StubGenerator::CopyLoopFunc copy_loop_func) {
 
12
     Label L_copy;
 
13
 
 
14
     assert(log2_elem_size <= 3, "the following code should be changed");
 
15
@@ -1277,7 +1277,8 @@
 
16
     __ inc(from, 8);
 
17
     __ sllx(O3, left_shift,  O3);
 
18
 
 
19
-    disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop);
 
20
+    StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_16_bytes_shift_loop;
 
21
+    disjoint_copy_core(from, to, count, log2_elem_size, 16, aFunction);
 
22
 
 
23
     __ inccc(count, count_dec>>1 ); // + 8 bytes
 
24
     __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
 
25
@@ -2156,7 +2157,8 @@
 
26
       __ dec(count, 4);   // The cmp at the beginning guaranty count >= 4
 
27
       __ sllx(O3, 32,  O3);
 
28
 
 
29
-      disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop);
 
30
+      StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_16_bytes_loop;
 
31
+      disjoint_copy_core(from, to, count, 2, 16, aFunction);
 
32
 
 
33
       __ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
 
34
       __ delayed()->inc(count, 4); // restore 'count'
 
35
@@ -2437,7 +2439,8 @@
 
36
     // count >= 0 (original count - 8)
 
37
     __ mov(from, from64);
 
38
 
 
39
-    disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop);
 
40
+    StubGenerator::CopyLoopFunc aFunction = &StubGenerator::copy_64_bytes_loop;
 
41
+    disjoint_copy_core(from64, to64, count, 3, 64, aFunction);
 
42
 
 
43
       // Restore O4(offset0), O5(offset8)
 
44
       __ sub(from64, from, offset0);