← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/hotspot-s390.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose, Damien Raude-Morvan, Matthias Klose
  • Date: 2011-07-10 14:28:17 UTC
  • mfrom: (1.1.4 upstream) (8.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110710142817-tl5xz1zv1aejnbi1
Tags: 7~b143-2.0~pre1-1
[ Damien Raude-Morvan ]
* New b143 code drop.
* Drop d/patches/7031385.diff: Merged upstream.
* Drop d/patches/jamvm-oj7.patch: Merged upstream.
* Manpages are now ja_JP.UTF-8 instead of ja_JP.eucJP

[ Matthias Klose ]
* Apply fix for IcedTea issue #753, #757.
* Update s390 hotspot build fixes.
* Re-enable zero on i386.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/hotspot-s390.diff
 
1
--- openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp~ 2011-05-19 11:27:44.000000000 +0000
 
2
+++ openjdk/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp  2011-06-02 10:11:42.000000000 +0000
 
3
@@ -188,7 +188,7 @@
 
4
   const size_t num_overflow_elems = of_stack->size();
 
5
   const size_t space_available = queue->max_elems() - queue->size();
 
6
   const size_t num_take_elems = MIN3(space_available / 4,
 
7
-                                     ParGCDesiredObjsFromOverflowList,
 
8
+                                     (size_t)ParGCDesiredObjsFromOverflowList,
 
9
                                      num_overflow_elems);
 
10
   // Transfer the most recent num_take_elems from the overflow
 
11
   // stack to our work queue.
 
12
--- openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp~  2011-05-19 11:27:44.000000000 +0000
 
13
+++ openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp   2011-06-02 10:10:24.000000000 +0000
 
14
@@ -62,7 +62,7 @@
 
15
   if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
 
16
     _region_start = covered_region.start();
 
17
     _region_size = covered_region.word_size();
 
18
-    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
 
19
+    uintptr_t* map = (uintptr_t*)_virtual_space->reserved_low_addr();
 
20
     _beg_bits.set_map(map);
 
21
     _beg_bits.set_size(bits / 2);
 
22
     _end_bits.set_map(map + words / 2);
 
23
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp~     2011-05-19 11:27:44.000000000 +0000
 
24
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp      2011-06-02 09:29:49.000000000 +0000
 
25
@@ -1078,7 +1078,7 @@
 
26
 // This can be done by either mutator threads together with the
 
27
 // concurrent refinement threads or GC threads.
 
28
 int HeapRegionRemSet::num_par_rem_sets() {
 
29
-  return (int)MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
 
30
+  return (int)MAX2((uintx)DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
 
31
 }
 
32
 
 
33
 HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
 
34
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp~       2011-05-19 11:27:44.000000000 +0000
 
35
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp        2011-06-02 09:11:25.000000000 +0000
 
36
@@ -471,7 +471,7 @@
 
37
   _regionStack(),
 
38
   // _finger set in set_non_marking_state
 
39
 
 
40
-  _max_task_num(MAX2(ParallelGCThreads, (size_t)1)),
 
41
+  _max_task_num(MAX2((size_t)ParallelGCThreads, (size_t)1)),
 
42
   // _active_tasks set in set_non_marking_state
 
43
   // _tasks set inside the constructor
 
44
   _task_queues(new CMTaskQueueSet((int) _max_task_num)),
 
45
@@ -575,7 +575,7 @@
 
46
       _sleep_factor             = sleep_factor;
 
47
       _marking_task_overhead    = marking_task_overhead;
 
48
     } else {
 
49
-      _parallel_marking_threads = MAX2((ParallelGCThreads + 2) / 4, (size_t)1);
 
50
+      _parallel_marking_threads = MAX2((size_t)(ParallelGCThreads + 2) / 4, (size_t)1);
 
51
       _sleep_factor             = 0.0;
 
52
       _marking_task_overhead    = 1.0;
 
53
     }
 
54
@@ -3631,7 +3631,7 @@
 
55
   // of things to do) or totally (at the very end).
 
56
   size_t target_size;
 
57
   if (partially)
 
58
-    target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
 
59
+    target_size = MIN2((size_t) (_task_queue->max_elems()/3), (size_t)GCDrainStackTargetSize);
 
60
   else
 
61
     target_size = 0;
 
62
 
 
63
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp~      2011-05-19 11:27:44.000000000 +0000
 
64
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp       2011-06-02 09:26:12.000000000 +0000
 
65
@@ -1792,7 +1792,7 @@
 
66
 
 
67
   verify_region_sets_optional();
 
68
 
 
69
-  size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
 
70
+  size_t expand_bytes = MAX2((size_t) (word_size * HeapWordSize), (size_t)MinHeapDeltaBytes);
 
71
   if (expand(expand_bytes)) {
 
72
     verify_region_sets_optional();
 
73
     return attempt_allocation_at_safepoint(word_size,
 
74
--- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp~    2011-05-19 11:27:44.000000000 +0000
 
75
+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp     2011-06-02 09:08:04.000000000 +0000
 
76
@@ -2647,7 +2647,7 @@
 
77
   if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
 
78
     size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
 
79
     n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
 
80
-    n_blks = MIN2(n_blks, CMSOldPLABMax);
 
81
+    n_blks = MIN2(n_blks, (size_t) CMSOldPLABMax);
 
82
   }
 
83
   assert(n_blks > 0, "Error");
 
84
   _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
 
85
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp~ 2011-06-02 08:29:39.000000000 +0000
 
86
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp  2011-06-02 08:55:15.000000000 +0000
 
87
@@ -1170,7 +1170,7 @@
 
88
       // so it's NewRatio x of NewSize.
 
89
       if (FLAG_IS_DEFAULT(OldSize)) {
 
90
         if (max_heap > NewSize) {
 
91
-          FLAG_SET_ERGO(uintx, OldSize, MIN2(NewRatio*NewSize, max_heap - NewSize));
 
92
+          FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t) (NewRatio*NewSize), (size_t) (max_heap - NewSize)));
 
93
           if (PrintGCDetails && Verbose) {
 
94
             // Too early to use gclog_or_tty
 
95
             tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
 
96
--- openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp~   2011-05-19 11:27:44.000000000 +0000
 
97
+++ openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp    2011-06-02 08:51:09.000000000 +0000
 
98
@@ -52,7 +52,7 @@
 
99
 
 
100
 inline bool BitMap::par_set_bit(idx_t bit) {
 
101
   verify_index(bit);
 
102
-  volatile idx_t* const addr = word_addr(bit);
 
103
+  volatile idx_t* const addr = (idx_t *)word_addr(bit);
 
104
   const idx_t mask = bit_mask(bit);
 
105
   idx_t old_val = *addr;
 
106
 
 
107
@@ -73,7 +73,7 @@
 
108
 
 
109
 inline bool BitMap::par_clear_bit(idx_t bit) {
 
110
   verify_index(bit);
 
111
-  volatile idx_t* const addr = word_addr(bit);
 
112
+  volatile idx_t* const addr = (idx_t *)word_addr(bit);
 
113
   const idx_t mask = ~bit_mask(bit);
 
114
   idx_t old_val = *addr;
 
115
 
 
116
--- openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp~ 2011-05-19 11:27:44.000000000 +0000
 
117
+++ openjdk/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp  2011-06-02 09:35:36.000000000 +0000
 
118
@@ -46,7 +46,7 @@
 
119
   const size_t beg_index = size_t(index);
 
120
   assert(beg_index < len || len == 0, "index too large");
 
121
 
 
122
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
 
123
+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
 
124
   const size_t end_index = beg_index + stride;
 
125
   T* const base = (T*)a->base();
 
126
   T* const beg = base + beg_index;
 
127
@@ -80,7 +80,7 @@
 
128
   const size_t beg_index = size_t(index);
 
129
   assert(beg_index < len || len == 0, "index too large");
 
130
 
 
131
-  const size_t stride = MIN2(len - beg_index, ObjArrayMarkingStride);
 
132
+  const size_t stride = MIN2(len - beg_index, (size_t)ObjArrayMarkingStride);
 
133
   const size_t end_index = beg_index + stride;
 
134
   T* const base = (T*)a->base();
 
135
   T* const beg = base + beg_index;
 
136
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp~    2011-06-02 08:29:39.000000000 +0000
 
137
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp     2011-06-02 09:06:17.000000000 +0000
 
138
@@ -356,7 +356,7 @@
 
139
       // generally small compared to the NewRatio calculation.
 
140
       _min_gen0_size = NewSize;
 
141
       desired_new_size = NewSize;
 
142
-      max_new_size = MAX2(max_new_size, NewSize);
 
143
+      max_new_size = MAX2(max_new_size, (size_t) NewSize);
 
144
     } else {
 
145
       // For the case where NewSize is the default, use NewRatio
 
146
       // to size the minimum and initial generation sizes.
 
147
@@ -364,10 +364,10 @@
 
148
       // NewRatio is overly large, the resulting sizes can be too
 
149
       // small.
 
150
       _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),
 
151
-                          NewSize);
 
152
+                          (size_t) NewSize);
 
153
       desired_new_size =
 
154
         MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),
 
155
-             NewSize);
 
156
+             (size_t) NewSize);
 
157
     }
 
158
 
 
159
     assert(_min_gen0_size > 0, "Sanity check");
 
160
@@ -422,14 +422,14 @@
 
161
       // Adjust gen0 down to accomodate OldSize
 
162
       *gen0_size_ptr = heap_size - min_gen0_size;
 
163
       *gen0_size_ptr =
 
164
-        MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),
 
165
+        MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),
 
166
              min_alignment());
 
167
       assert(*gen0_size_ptr > 0, "Min gen0 is too large");
 
168
       result = true;
 
169
     } else {
 
170
       *gen1_size_ptr = heap_size - *gen0_size_ptr;
 
171
       *gen1_size_ptr =
 
172
-        MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),
 
173
+        MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),
 
174
                        min_alignment());
 
175
     }
 
176
   }
 
177
@@ -453,7 +453,7 @@
 
178
   // for setting the gen1 maximum.
 
179
   _max_gen1_size = max_heap_byte_size() - _max_gen0_size;
 
180
   _max_gen1_size =
 
181
-    MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),
 
182
+    MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),
 
183
          min_alignment());
 
184
   // If no explicit command line flag has been set for the
 
185
   // gen1 size, use what is left for gen1.
 
186
@@ -467,11 +467,11 @@
 
187
       "gen0 has an unexpected minimum size");
 
188
     set_min_gen1_size(min_heap_byte_size() - min_gen0_size());
 
189
     set_min_gen1_size(
 
190
-      MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),
 
191
+      MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),
 
192
            min_alignment()));
 
193
     set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());
 
194
     set_initial_gen1_size(
 
195
-      MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),
 
196
+      MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),
 
197
            min_alignment()));
 
198
 
 
199
   } else {
 
200
--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp~    2011-05-19 11:27:44.000000000 +0000
 
201
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp     2011-06-02 09:22:35.000000000 +0000
 
202
@@ -36,6 +36,7 @@
 
203
 #include "oops/oop.inline.hpp"
 
204
 #include "prims/jvmtiExport.hpp"
 
205
 #include "prims/jvmtiThreadState.hpp"
 
206
+#include "prims/methodHandles.hpp"
 
207
 #include "runtime/arguments.hpp"
 
208
 #include "runtime/deoptimization.hpp"
 
209
 #include "runtime/frame.inline.hpp"
 
210
--- openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp~        2011-05-19 11:27:44.000000000 +0000
 
211
+++ openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp 2011-06-02 09:45:34.000000000 +0000
 
212
@@ -25,6 +25,7 @@
 
213
 
 
214
 #include "precompiled.hpp"
 
215
 #include "assembler_zero.inline.hpp"
 
216
+#include "entry_zero.hpp"
 
217
 #include "memory/resourceArea.hpp"
 
218
 #include "nativeInst_zero.hpp"
 
219
 #include "oops/oop.inline.hpp"
 
220
--- openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp~     2011-05-19 11:27:44.000000000 +0000
 
221
+++ openjdk/hotspot/src/cpu/zero/vm/entry_zero.hpp      2011-06-02 09:50:55.000000000 +0000
 
222
@@ -26,6 +26,8 @@
 
223
 #ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
 
224
 #define CPU_ZERO_VM_ENTRY_ZERO_HPP
 
225
 
 
226
+#include "interpreter/cppInterpreter.hpp"
 
227
+
 
228
 class ZeroEntry {
 
229
  public:
 
230
   ZeroEntry() {