Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-4144492

(porting) Shared code mods to add "void" to prototypes with empty arg list

    XMLWordPrintable

    Details

    • Subcomponent:
    • Resolved In Build:
      1.2fcs
    • CPU:
      generic
    • OS:
      generic
    • Verification:
      Not verified

      Description

      For the JDK 116 release on the DIGITAL UNIX platform running on DIGITAL's
      Alpha hardware, DIGITAL has changed, for the reasons listed below, the
      following JDK 116 source files in the shared part of the JDK.

      Compatibility of the changes with Sun's JDK was assured by visual inspection of
      the changes and by running the appropriate JCK test suites. No changes were
      made to modify any APIs nor to modify the virtual machine instruction set.

      1. The following files were modified in order to get them to compile on
      DIGITAL UNIX:
        - Modified to add "void" to function prototypes with empty argument lists:
              src/share/java/runtime/monitor.c
              src/share/java/runtime/classresolver.c
              src/share/java/util/runtime_stubs.c

      Also changed return string to "ClassFormatError" from "ClassFormatException"
      within method Locked_InitializeClass, file classresolver.c. DEC thinks
      ClassFormatException is wrong. Note that the other places in classresolver.c
      that detect errors return ClassFormatError. Also, there is no
      ClassFormatException Java class in the JVM, but there is a ClassFormatError
      class.

      Finally, there is a change that is similiar to the change where DEC added
      case 'p' logic to util.c. (see bugid 4144352)
      This is actually a use of that case.

      Diffs:
      ======
      diff -r digital_src/src/share/java/runtime/monitor.c javasoft_src/src/share/java/runtime/monitor.c
      1d0
      < /* Modifications Copyright 1997 Digital Equipment Corporation */
      200c199
      < monitorRegistryInit(void) /*** HDS changed () to (void) ***/
      ---
      > monitorRegistryInit()


      diff -r digital_src/src/share/java/runtime/classresolver.c javasoft_src/src/share/java/runtime/classresolver.c
      1d0
      < /* Modifications Copyright 1997 Digital Equipment Corporation */
      70c69
      < static void InitPrimitiveClasses(void); /*** HDS added void ***/
      ---
      > static void InitPrimitiveClasses();
      431c430
      < /*** HDS bogus assert, see JCK test clfsup00602: sysAssert(!isInterface || super_itable_count == 0); ***/
      ---
      > sysAssert(!isInterface || super_itable_count == 0);
      696c695
      < return JAVAPKG "ClassFormatError"; /*** HDS change from ClassFormatException ***/
      ---
      > return JAVAPKG "ClassFormatException";
      906d904
      < /*** HDS added void param ***/
      908c906
      < PrintLoadedClasses(void)
      ---
      > PrintLoadedClasses()
      916,917c914
      < /*** aeo - from OSF: %x -> %p */
      < jio_fprintf(stdout, "class=%s, 0x%p\n", cbName(cb), cbLoader(cb));
      ---
      > jio_fprintf(stdout, "class=%s, 0x%x\n", cbName(cb), cbLoader(cb));
      1017c1014
      < lock_classes(void) /*** cds - added void ***/
      ---
      > lock_classes()
      1024c1021
      < unlock_classes(void) /*** cds - added void ***/
      ---
      > unlock_classes()
      1257d1253
      < /*** HDS added void param ***/
      1259c1255
      < InitPrimitiveClasses(void)
      ---
      > InitPrimitiveClasses()


      diff -r digital_src/src/share/java/util/runtime_stubs.c javasoft_src/src/share/java/util/runtime_stubs.c
      1d0
      < /* Modifications Copyright 1997 Digital Equipment Corporation */
      80,81c79
      < /*** HDS - add void to param list ***/
      < void *allocClassClass(void)
      ---
      > void *allocClassClass()

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              never Tom Rodriguez
              Reporter:
              jbenoit Jonathan Benoit (Inactive)
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Imported:
                Indexed: