]>
Commit | Line | Data |
---|---|---|
0fa4da98 JP |
1 | diff --git a/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp b/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp |
2 | index 31955ff7..6dcd90ac 100644 | |
3 | --- openjdk/hotspot/src/share/vm/adlc/adlparse.cpp | |
4 | +++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp | |
5 | @@ -4564,7 +4564,7 @@ char *ADLParser::get_paren_expr(const char *description, bool include_location) | |
6 | // string(still inside the file buffer). Returns a pointer to the string or | |
7 | // NULL if some other token is found instead. | |
8 | char *ADLParser::get_ident_common(bool do_preproc) { | |
9 | - register char c; | |
10 | + char c; | |
11 | char *start; // Pointer to start of token | |
12 | char *end; // Pointer to end of token | |
13 | ||
14 | @@ -4762,7 +4762,7 @@ char *ADLParser::get_unique_ident(FormDict& dict, const char* nameDescription){ | |
15 | // invokes a parse_err if the next token is not an integer. | |
16 | // This routine does not leave the integer null-terminated. | |
17 | int ADLParser::get_int(void) { | |
18 | - register char c; | |
19 | + char c; | |
20 | char *start; // Pointer to start of token | |
21 | char *end; // Pointer to end of token | |
22 | int result; // Storage for integer result | |
23 | diff --git a/openjdk/hotspot/src/share/vm/adlc/arena.cpp b/openjdk/hotspot/src/share/vm/adlc/arena.cpp | |
24 | index d7e4fc6e..406187ae 100644 | |
25 | --- openjdk/hotspot/src/share/vm/adlc/arena.cpp | |
26 | +++ openjdk/hotspot/src/share/vm/adlc/arena.cpp | |
27 | @@ -79,7 +79,7 @@ Arena::Arena( Arena *a ) | |
28 | // Total of all Chunks in arena | |
29 | size_t Arena::used() const { | |
30 | size_t sum = _chunk->_len - (_max-_hwm); // Size leftover in this Chunk | |
31 | - register Chunk *k = _first; | |
32 | + Chunk *k = _first; | |
33 | while( k != _chunk) { // Whilst have Chunks in a row | |
34 | sum += k->_len; // Total size of this Chunk | |
35 | k = k->_next; // Bump along to next Chunk | |
36 | @@ -93,7 +93,7 @@ void* Arena::grow( size_t x ) { | |
37 | // Get minimal required size. Either real big, or even bigger for giant objs | |
38 | size_t len = max(x, Chunk::size); | |
39 | ||
40 | - register Chunk *k = _chunk; // Get filled-up chunk address | |
41 | + Chunk *k = _chunk; // Get filled-up chunk address | |
42 | _chunk = new (len) Chunk(len); | |
43 | ||
44 | if( k ) k->_next = _chunk; // Append new chunk to end of linked list | |
45 | diff --git a/openjdk/hotspot/src/share/vm/adlc/dict2.cpp b/openjdk/hotspot/src/share/vm/adlc/dict2.cpp | |
46 | index f341a2b6..2dc60b25 100644 | |
47 | --- openjdk/hotspot/src/share/vm/adlc/dict2.cpp | |
48 | +++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp | |
49 | @@ -283,9 +283,9 @@ void Dict::print(PrintKeyOrValue print_key, PrintKeyOrValue print_value) { | |
50 | // limited to MAXID characters in length. Experimental evidence on 150K of | |
51 | // C text shows excellent spreading of values for any size hash table. | |
52 | int hashstr(const void *t) { | |
53 | - register char c, k = 0; | |
54 | - register int sum = 0; | |
55 | - register const char *s = (const char *)t; | |
56 | + char c, k = 0; | |
57 | + int sum = 0; | |
58 | + const char *s = (const char *)t; | |
59 | ||
60 | while (((c = s[k]) != '\0') && (k < MAXID-1)) { // Get characters till nul | |
61 | c = (char) ((c << 1) + 1); // Characters are always odd! | |
62 | diff --git a/openjdk/hotspot/src/share/vm/adlc/main.cpp b/openjdk/hotspot/src/share/vm/adlc/main.cpp | |
63 | index 52044f12..40bcda74 100644 | |
64 | --- openjdk/hotspot/src/share/vm/adlc/main.cpp | |
65 | +++ openjdk/hotspot/src/share/vm/adlc/main.cpp | |
66 | @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) | |
67 | ||
68 | // Read command line arguments and file names | |
69 | for( int i = 1; i < argc; i++ ) { // For all arguments | |
70 | - register char *s = argv[i]; // Get option/filename | |
71 | + char *s = argv[i]; // Get option/filename | |
72 | ||
73 | if( *s++ == '-' ) { // It's a flag? (not a filename) | |
74 | if( !*s ) { // Stand-alone `-' means stdin |