mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-19 10:34:38 +02:00
Merge
This commit is contained in:
commit
fdee542113
654 changed files with 12550 additions and 7320 deletions
|
@ -54,9 +54,29 @@ enum {
|
|||
JVM_ACC_STRICT = 0x0800,
|
||||
JVM_ACC_SYNTHETIC = 0x1000,
|
||||
JVM_ACC_ANNOTATION = 0x2000,
|
||||
JVM_ACC_ENUM = 0x4000
|
||||
JVM_ACC_ENUM = 0x4000,
|
||||
JVM_ACC_MODULE = 0x8000
|
||||
};
|
||||
|
||||
#define JVM_ACC_PUBLIC_BIT 0
|
||||
#define JVM_ACC_PRIVATE_BIT 1
|
||||
#define JVM_ACC_PROTECTED_BIT 2
|
||||
#define JVM_ACC_STATIC_BIT 3
|
||||
#define JVM_ACC_FINAL_BIT 4
|
||||
#define JVM_ACC_SYNCHRONIZED_BIT 5
|
||||
#define JVM_ACC_SUPER_BIT 5
|
||||
#define JVM_ACC_VOLATILE_BIT 6
|
||||
#define JVM_ACC_BRIDGE_BIT 6
|
||||
#define JVM_ACC_TRANSIENT_BIT 7
|
||||
#define JVM_ACC_VARARGS_BIT 7
|
||||
#define JVM_ACC_NATIVE_BIT 8
|
||||
#define JVM_ACC_INTERFACE_BIT 9
|
||||
#define JVM_ACC_ABSTRACT_BIT 10
|
||||
#define JVM_ACC_STRICT_BIT 11
|
||||
#define JVM_ACC_SYNTHETIC_BIT 12
|
||||
#define JVM_ACC_ANNOTATION_BIT 13
|
||||
#define JVM_ACC_ENUM_BIT 14
|
||||
|
||||
/* Used in newarray instruction. */
|
||||
|
||||
enum {
|
||||
|
@ -86,8 +106,9 @@ enum {
|
|||
JVM_CONSTANT_InterfaceMethodref = 11,
|
||||
JVM_CONSTANT_NameAndType = 12,
|
||||
JVM_CONSTANT_MethodHandle = 15, // JSR 292
|
||||
JVM_CONSTANT_MethodType = 16, // JSR 292
|
||||
JVM_CONSTANT_InvokeDynamic = 18
|
||||
JVM_CONSTANT_MethodType = 16, // JSR 292
|
||||
JVM_CONSTANT_InvokeDynamic = 18,
|
||||
JVM_CONSTANT_ExternalMax = 18
|
||||
};
|
||||
|
||||
/* JVM_CONSTANT_MethodHandle subtypes */
|
||||
|
|
|
@ -1155,20 +1155,25 @@ JVM_NativePath(char *);
|
|||
* be renamed to JVM_* in the future?
|
||||
*/
|
||||
|
||||
/*
|
||||
* BE CAREFUL! The following functions do not implement the
|
||||
* full feature set of standard C printf formats.
|
||||
*/
|
||||
int
|
||||
/* jio_snprintf() and jio_vsnprintf() behave like snprintf(3) and vsnprintf(3),
|
||||
* respectively, with the following differences:
|
||||
* - The string written to str is always zero-terminated, also in case of
|
||||
* truncation (count is too small to hold the result string), unless count
|
||||
* is 0. In case of truncation count-1 characters are written and '\0'
|
||||
* appendend.
|
||||
* - If count is too small to hold the whole string, -1 is returned across
|
||||
* all platforms. */
|
||||
|
||||
JNIEXPORT int
|
||||
jio_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
|
||||
|
||||
int
|
||||
JNIEXPORT int
|
||||
jio_snprintf(char *str, size_t count, const char *fmt, ...);
|
||||
|
||||
int
|
||||
JNIEXPORT int
|
||||
jio_fprintf(FILE *, const char *fmt, ...);
|
||||
|
||||
int
|
||||
JNIEXPORT int
|
||||
jio_vfprintf(FILE *, const char *fmt, va_list args);
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue