procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libjava

Browse source 
* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.

From-SVN: r123965
This commit is contained in:
Tom Tromey 2007-04-19 00:24:09 +00:00 • committed by Tom Tromey
parent 5604bf10dd
commit 06a4a50762
92 changed files with 220 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
View file

@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentHashMap$EntryIterator : public ::java::u
public: // actually package-private
ConcurrentHashMap$EntryIterator(::java::util::concurrent::ConcurrentHashMap *);
public:
::java::util::Map$Entry * target$next();
::java::util::Map$Entry * ConcurrentHashMap$EntryIterator$next();
::java::lang::Object * next();
public: // actually package-private
::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;

2
libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
View file

@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$EntryIterator : public ::jav
public: // actually package-private
ConcurrentSkipListMap$EntryIterator(::java::util::concurrent::ConcurrentSkipListMap *);
public:
::java::util::Map$Entry * target$next();
::java::util::Map$Entry * ConcurrentSkipListMap$EntryIterator$next();
::java::lang::Object * next();
public: // actually package-private
::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;

6
libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
View file

@ -38,9 +38,9 @@ public:
::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
::java::util::NavigableSet * target$headSet(::java::lang::Object *);
::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$subSet(::java::lang::Object *, ::java::lang::Object *);
::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$headSet(::java::lang::Object *);
::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$tailSet(::java::lang::Object *);
::java::util::NavigableSet * descendingSet();
::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
::java::util::SortedSet * tailSet(::java::lang::Object *);

2
libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
View file

@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapEntryIterator :
public: // actually package-private
ConcurrentSkipListMap$SubMap$SubMapEntryIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
public:
::java::util::Map$Entry * target$next();
::java::util::Map$Entry * ConcurrentSkipListMap$SubMap$SubMapEntryIterator$next();
::java::lang::Object * next();
public: // actually package-private
::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;

16
libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
View file

@ -46,13 +46,13 @@ public:
private:
::java::util::concurrent::ConcurrentSkipListMap$SubMap * newSubMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
public:
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$descendingMap();
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *, jboolean);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, ::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *);
::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$descendingMap();
::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
::java::lang::Object * ceilingKey(::java::lang::Object *);
::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
@ -67,7 +67,7 @@ public:
::java::util::Map$Entry * lastEntry();
::java::util::Map$Entry * pollFirstEntry();
::java::util::Map$Entry * pollLastEntry();
::java::util::NavigableSet * target$keySet();
::java::util::NavigableSet * ConcurrentSkipListMap$SubMap$keySet();
::java::util::NavigableSet * navigableKeySet();
::java::util::Collection * values();
::java::util::Set * entrySet();

18
libjava/java/util/concurrent/ConcurrentSkipListMap.h
View file

@ -51,7 +51,7 @@ public:
ConcurrentSkipListMap(::java::util::Comparator *);
ConcurrentSkipListMap(::java::util::Map *);
ConcurrentSkipListMap(::java::util::SortedMap *);
virtual ::java::util::concurrent::ConcurrentSkipListMap * target$clone();
virtual ::java::util::concurrent::ConcurrentSkipListMap * ConcurrentSkipListMap$clone();
private:
void buildFromSorted(::java::util::SortedMap *);
void writeObject(::java::io::ObjectOutputStream *);
@ -65,11 +65,11 @@ public:
virtual jint size();
virtual jboolean isEmpty();
virtual void clear();
virtual ::java::util::NavigableSet * target$keySet();
virtual ::java::util::NavigableSet * ConcurrentSkipListMap$keySet();
virtual ::java::util::NavigableSet * navigableKeySet();
virtual ::java::util::Collection * values();
virtual ::java::util::Set * entrySet();
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$descendingMap();
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$descendingMap();
virtual ::java::util::NavigableSet * descendingKeySet();
virtual jboolean equals(::java::lang::Object *);
virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
@ -79,12 +79,12 @@ public:
virtual ::java::util::Comparator * comparator();
virtual ::java::lang::Object * firstKey();
virtual ::java::lang::Object * lastKey();
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *);
virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *, jboolean);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, ::java::lang::Object *);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *);
virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *);
virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
virtual ::java::lang::Object * lowerKey(::java::lang::Object *);
virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *);

8
libjava/java/util/concurrent/ConcurrentSkipListSet.h
View file

@ -29,7 +29,7 @@ public:
public: // actually package-private
ConcurrentSkipListSet(::java::util::concurrent::ConcurrentNavigableMap *);
public:
virtual ::java::util::concurrent::ConcurrentSkipListSet * target$clone();
virtual ::java::util::concurrent::ConcurrentSkipListSet * ConcurrentSkipListSet$clone();
virtual jint size();
virtual jboolean isEmpty();
virtual jboolean contains(::java::lang::Object *);
@ -52,9 +52,9 @@ public:
virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
virtual ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
virtual ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
virtual ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
virtual ::java::util::NavigableSet * ConcurrentSkipListSet$subSet(::java::lang::Object *, ::java::lang::Object *);
virtual ::java::util::NavigableSet * ConcurrentSkipListSet$headSet(::java::lang::Object *);
virtual ::java::util::NavigableSet * ConcurrentSkipListSet$tailSet(::java::lang::Object *);
virtual ::java::util::NavigableSet * descendingSet();
private:
void setMap(::java::util::concurrent::ConcurrentNavigableMap *);

2
libjava/java/util/concurrent/DelayQueue$Itr.h
View file

@ -17,7 +17,7 @@ public: // actually package-private
DelayQueue$Itr(::java::util::concurrent::DelayQueue *, JArray< ::java::lang::Object * > *);
public:
virtual jboolean hasNext();
virtual ::java::util::concurrent::Delayed * target$next();
virtual ::java::util::concurrent::Delayed * DelayQueue$Itr$next();
virtual void remove();
virtual ::java::lang::Object * next();
public: // actually package-private

16
libjava/java/util/concurrent/DelayQueue.h
View file

@ -16,14 +16,14 @@ class java::util::concurrent::DelayQueue : public ::java::util::AbstractQueue
public:
DelayQueue();
DelayQueue(::java::util::Collection *);
virtual jboolean target$add(::java::util::concurrent::Delayed *);
virtual jboolean target$offer(::java::util::concurrent::Delayed *);
virtual void target$put(::java::util::concurrent::Delayed *);
virtual jboolean target$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::util::concurrent::Delayed * target$poll();
virtual ::java::util::concurrent::Delayed * target$take();
virtual ::java::util::concurrent::Delayed * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::util::concurrent::Delayed * target$peek();
virtual jboolean DelayQueue$add(::java::util::concurrent::Delayed *);
virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *);
virtual void DelayQueue$put(::java::util::concurrent::Delayed *);
virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::util::concurrent::Delayed * DelayQueue$poll();
virtual ::java::util::concurrent::Delayed * DelayQueue$take();
virtual ::java::util::concurrent::Delayed * DelayQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::util::concurrent::Delayed * DelayQueue$peek();
virtual jint size();
virtual jint drainTo(::java::util::Collection *);
virtual jint drainTo(::java::util::Collection *, jint);

2
libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
View file

@ -15,7 +15,7 @@ public: // actually package-private
ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
public:
jboolean hasNext();
::java::lang::Runnable * target$next();
::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next();
void remove();
::java::lang::Object * next();
private:

20
libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
View file

@ -15,16 +15,16 @@ class java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue : pub
ScheduledThreadPoolExecutor$DelayedWorkQueue();
public:
virtual ::java::lang::Runnable * target$poll();
virtual ::java::lang::Runnable * target$peek();
virtual ::java::lang::Runnable * target$take();
virtual ::java::lang::Runnable * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
virtual jboolean target$add(::java::lang::Runnable *);
virtual jboolean target$offer(::java::lang::Runnable *);
virtual void target$put(::java::lang::Runnable *);
virtual jboolean target$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::lang::Runnable * target$remove();
virtual ::java::lang::Runnable * target$element();
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll();
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$peek();
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$take();
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$add(::java::lang::Runnable *);
virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *);
virtual void ScheduledThreadPoolExecutor$DelayedWorkQueue$put(::java::lang::Runnable *);
virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$remove();
virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$element();
virtual void clear();
virtual jint drainTo(::java::util::Collection *);
virtual jint drainTo(::java::util::Collection *, jint);

2
libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
View file

@ -17,7 +17,7 @@ public: // actually package-private
ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::util::concurrent::Callable *, jlong);
public:
virtual jlong getDelay(::java::util::concurrent::TimeUnit *);
virtual jint target$compareTo(::java::util::concurrent::Delayed *);
virtual jint ScheduledThreadPoolExecutor$ScheduledFutureTask$compareTo(::java::util::concurrent::Delayed *);
virtual jboolean isPeriodic();
private:
void runPeriodic();

2
libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
View file

@ -14,7 +14,7 @@ class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHold
public: // actually package-private
ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter();
public:
::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue();
::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter$initialValue();
::java::lang::Object * initialValue();
static ::java::lang::Class class$;
};

4
libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
View file

@ -14,8 +14,8 @@ class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lan
public:
ReentrantReadWriteLock();
ReentrantReadWriteLock(jboolean);
virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock();
virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock();
virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * ReentrantReadWriteLock$writeLock();
virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * ReentrantReadWriteLock$readLock();
virtual jboolean isFair();
public: // actually protected
virtual ::java::lang::Thread * getOwner();