-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Initial Handling of Non-Void Java Method Calls in GnuCOBOL #174
base: java-interop
Are you sure you want to change the base?
Changes from 3 commits
452d4ec
7b31a0b
332e29c
1f90ff3
da1b85d
0013016
91751c8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,11 @@ | ||
|
||
2024-07-12 Vedant Tewari <[email protected]> | ||
|
||
2023-02-25 Ron Norman <[email protected]> | ||
* ax_prog_java.m4: Added macro for jni check | ||
* ax_jni_include_dir.m4: Added macro for jni check | ||
* configure.ac: added support for Java interoperability through JNI | ||
|
||
2023-02-25 Ron Norman <[email protected]> | ||
|
||
* configure.ac: Add check for sys/time.h | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,8 @@ | ||
|
||
2024-08-14 Nicolas Berthier <[email protected]> | ||
|
||
* cobc.c (cobc_print_info): added note for Java interoperability | ||
|
||
2024-08-04 David Declerck <[email protected]> | ||
|
||
Adjustments to merge 2022-12-21: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
/* | ||
Copyright (C) 2003-2024 Free Software Foundation, Inc. | ||
Written by Keisuke Nishida, Roger While, Ron Norman, Simon Sobisch, | ||
Edward Hart | ||
Edward Hart, Vedant Tewari | ||
|
||
This file is part of GnuCOBOL. | ||
|
||
|
@@ -147,6 +147,7 @@ static struct literal_list *literal_cache = NULL; | |
static struct field_list *field_cache = NULL; | ||
static struct field_list *local_field_cache = NULL; | ||
static struct call_list *call_cache = NULL; | ||
static struct call_list *call_java_cache = NULL; | ||
static struct call_list *func_call_cache = NULL; | ||
static struct static_call_list *static_call_cache = NULL; | ||
static struct base_list *base_cache = NULL; | ||
|
@@ -395,6 +396,22 @@ lookup_source (const char *p) | |
return source_id++; | ||
} | ||
|
||
static void | ||
lookup_java_call(const char *p) | ||
{ | ||
struct call_list *clp; | ||
|
||
for (clp = call_java_cache; clp; clp = clp->next) { | ||
if (strcmp (p, clp->call_name) == 0) { | ||
return; | ||
} | ||
} | ||
clp = cobc_parse_malloc (sizeof (struct call_list)); | ||
clp->call_name = p; | ||
clp->next = call_java_cache; | ||
call_java_cache = clp; | ||
} | ||
|
||
static void | ||
lookup_call (const char *p) | ||
{ | ||
|
@@ -1978,6 +1995,11 @@ output_call_cache (void) | |
output_local ("static cob_call_union\tcall_%s;\n", | ||
call->call_name); | ||
} | ||
call_java_cache = call_list_reverse (call_java_cache); | ||
for (call = call_java_cache; call; call = call->next) { | ||
output_local ("static cob_java_handle*\tcall_java_%s;\n", | ||
call->call_name); | ||
} | ||
func_call_cache = call_list_reverse (func_call_cache); | ||
for (call = func_call_cache; call; call = call->next) { | ||
output_local ("static cob_call_union\tfunc_%s;\n", | ||
|
@@ -7068,6 +7090,132 @@ output_field_constant (cb_tree x, int n, const char *flagname) | |
output_newline (); | ||
} | ||
|
||
static void | ||
output_java_call (struct cb_call *p) | ||
{ | ||
char* full_name = (char *)CB_LITERAL(p->name)->data; /* Assume java.prefix (enforced in `parser.y`, rule `call_body`)*/ | ||
char* class_and_method_name = full_name + 5; | ||
char *last_dot; | ||
char *method_name; | ||
const char *class_name; | ||
char method_signature[256] = "("; | ||
char* mangled; | ||
struct cb_tree *ptr; | ||
|
||
mangled = strdup(class_and_method_name); | ||
for (size_t i = 0; i < strlen(mangled) + 1; i++) { | ||
mangled[i] = (mangled[i] == '.') ? '_' : mangled[i]; | ||
} | ||
|
||
last_dot = strrchr(class_and_method_name, '.'); | ||
if (last_dot == NULL) { | ||
cobc_err_msg (_("malformed call '%s' to a Java method"), class_and_method_name); | ||
COBC_ABORT (); | ||
} | ||
|
||
*last_dot = '\0'; | ||
method_name = last_dot + 1; | ||
class_name = class_and_method_name; | ||
|
||
for(ptr = p->args; ptr != NULL; ptr = ptr->next) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note: indentation is strange here. I think you need to adjust that in your settings for this project. |
||
switch(CB_TREE_TAG(ptr)) { | ||
case CB_TAG_INTEGER: | ||
strcat(method_signature, "I"); | ||
break; | ||
case CB_TAG_LONG: | ||
strcat(method_signature, "J"); | ||
break; | ||
case CB_TAG_FLOAT: | ||
strcat(method_signature, "F"); | ||
break; | ||
case CB_TAG_DOUBLE: | ||
strcat(method_signature, "D"); | ||
break; | ||
case CB_TAG_BOOLEAN: | ||
strcat(method_signature, "Z"); | ||
break; | ||
case CB_TAG_BYTE: | ||
strcat(method_signature, "B"); | ||
break; | ||
case CB_TAG_SHORT: | ||
strcat(method_signature, "S"); | ||
break; | ||
case CB_TAG_CHAR: | ||
strcat(method_signature, "C"); | ||
break; | ||
case CB_TAG_STRING: | ||
strcat(method_signature, "Ljava/lang/String;"); | ||
break; | ||
case CB_TAG_OBJECT: | ||
strcat(method_signature, "Ljava/lang/Object;"); | ||
break; | ||
case CB_TAG_LITERAL: | ||
if(CB_TREE_CATEGORY(ptr) == CB_CATEGORY_NUMERIC) { | ||
strcat(method_signature, "I"); | ||
} else if(CB_TREE_CATEGORY(ptr) == CB_CATEGORY_ALPHANUMERIC) { | ||
strcat(method_signature, "Ljava/lang/String;"); | ||
} | ||
break; | ||
case CB_TAG_ARRAY: | ||
switch(CB_TREE_TAG(CB_TREE(ptr)->next)) { | ||
case CB_TAG_INTEGER: | ||
strcat(method_signature, "[I"); | ||
break; | ||
case CB_TAG_LONG: | ||
strcat(method_signature, "[J"); | ||
break; | ||
case CB_TAG_FLOAT: | ||
strcat(method_signature, "[F"); | ||
break; | ||
case CB_TAG_DOUBLE: | ||
strcat(method_signature, "[D"); | ||
break; | ||
case CB_TAG_BOOLEAN: | ||
strcat(method_signature, "[Z"); | ||
break; | ||
case CB_TAG_BYTE: | ||
strcat(method_signature, "[B"); | ||
break; | ||
case CB_TAG_SHORT: | ||
strcat(method_signature, "[S"); | ||
break; | ||
case CB_TAG_CHAR: | ||
strcat(method_signature, "[C"); | ||
break; | ||
case CB_TAG_STRING: | ||
strcat(method_signature, "[Ljava/lang/String;"); | ||
break; | ||
case CB_TAG_OBJECT: | ||
strcat(method_signature, "[Ljava/lang/Object;"); | ||
break; | ||
default: | ||
cobc_err_msg(_("Unsupported array type in Java method call")); | ||
COBC_ABORT(); | ||
} | ||
break; | ||
default: | ||
cobc_err_msg(_("Unsupported argument type in Java method call")); | ||
COBC_ABORT(); | ||
} | ||
} | ||
|
||
strcat(method_signature, ")V"); | ||
|
||
lookup_java_call(mangled); | ||
output_line("if (call_java_%s == NULL)", mangled); | ||
output_block_open(); | ||
|
||
output_prefix(); | ||
output_line("call_java_%s = ", mangled); | ||
output("cob_resolve_java(\"%s\", \"%s\", \"()V\");", class_name, method_name, method_signature); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here you should probable replace |
||
output_newline (); | ||
output_prefix (); | ||
output_line("cob_call_java(call_java_%s);\n", mangled); | ||
output_newline(); | ||
output_block_close(); | ||
cobc_free(mangled); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will likely cause a use-after-free since |
||
} | ||
|
||
static void | ||
output_call (struct cb_call *p) | ||
{ | ||
|
@@ -7097,6 +7245,11 @@ output_call (struct cb_call *p) | |
} | ||
system_call = NULL; | ||
|
||
if (p->convention & CB_CONV_JAVA) { | ||
output_java_call(p); | ||
return; | ||
} | ||
|
||
#ifdef _WIN32 | ||
if (p->convention & CB_CONV_STDCALL) { | ||
convention = "_std"; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For internal buffer sizes you have
COB_*_BUFF
definitions inlibcob/common.h
that you can use here as well. Typical signature length could exceed 256 without much effort I think (with long-enough Java package names). I'd go forCOB_NORMAL_BUFF
(2048) for now.