amizilla-cvs Mailing List for AmiZilla (Page 5)
Brought to you by:
maxlarsson
Menu
▾
▴
amizilla-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(41) |
Jul
(50) |
Aug
(3) |
Sep
(3) |
Oct
(106) |
Nov
(9) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:36:58
|
Update of /cvsroot/amizilla/amizilla/directory/c-sdk/ldap/libraries/libprldap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25292/ldap/libraries/libprldap Added Files: prldap50.ix Log Message: AmigaOS shared library linker file. --- NEW FILE: prldap50.ix --- #define VERSION 5 #define REVISION 0 |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:35:28
|
Update of /cvsroot/amizilla/amizilla/dbm/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24755/d Modified Files: Makefile.in h_page.c hash.c Log Message: AmigaOS defines. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/dbm/src/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 22 Jun 2003 11:31:44 -0000 1.1.1.1 --- Makefile.in 11 Oct 2004 20:35:10 -0000 1.2 *************** *** 63,68 **** LOCAL_INCLUDES = -I$(srcdir)/../include ! FORCE_STATIC_LIB = 1 FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk --- 63,73 ---- LOCAL_INCLUDES = -I$(srcdir)/../include ! FORCE_STATIC_LIB = 1 ! ! ifeq ($(OS_ARCH),amigaos) ! FORCE_NO_PIC = 1 ! else FORCE_USE_PIC = 1 + endif include $(topsrcdir)/config/rules.mk Index: h_page.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/dbm/src/h_page.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** h_page.c 22 Jun 2003 11:31:43 -0000 1.1.1.1 --- h_page.c 11 Oct 2004 20:35:10 -0000 1.2 *************** *** 1174,1178 **** char filename[1024]; ! #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) /* Block signals; make sure file goes away at process exit. */ (void)sigfillset(&set); --- 1174,1178 ---- char filename[1024]; ! #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_AMIGAOS) /* Block signals; make sure file goes away at process exit. */ (void)sigfillset(&set); *************** *** 1211,1215 **** if ((hashp->fp = mkstemp(filename)) != -1) { (void)unlink(filename); ! #if !defined(macintosh) (void)fcntl(hashp->fp, F_SETFD, 1); #endif --- 1211,1215 ---- if ((hashp->fp = mkstemp(filename)) != -1) { (void)unlink(filename); ! #if !defined(macintosh) && !defined(XP_AMIGAOS) (void)fcntl(hashp->fp, F_SETFD, 1); #endif *************** *** 1217,1221 **** #endif ! #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) (void)sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL); #endif --- 1217,1221 ---- #endif ! #if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_AMIGAOS) (void)sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL); #endif Index: hash.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/dbm/src/hash.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** hash.c 22 Jun 2003 11:31:44 -0000 1.1.1.1 --- hash.c 11 Oct 2004 20:35:10 -0000 1.2 *************** *** 186,192 **** if (file) { ! #if defined(_WIN32) || defined(_WINDOWS) || defined (macintosh) || defined(XP_OS2) if ((hashp->fp = DBFILE_OPEN(file, flags | O_BINARY, mode)) == -1) RETURN_ERROR(errno, error0); #else if ((hashp->fp = open(file, flags, mode)) == -1) --- 186,195 ---- if (file) { ! #if defined(_WIN32) || defined(_WINDOWS) || defined (macintosh) || defined(XP_OS2) if ((hashp->fp = DBFILE_OPEN(file, flags | O_BINARY, mode)) == -1) RETURN_ERROR(errno, error0); + #elif defined(XP_AMIGAOS) + if ((hashp->fp = DBFILE_OPEN(file, flags, mode)) == -1) + RETURN_ERROR(errno, error0); #else if ((hashp->fp = open(file, flags, mode)) == -1) |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:35:28
|
Update of /cvsroot/amizilla/amizilla/dbm/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24755/tests Modified Files: Makefile.in Log Message: AmigaOS defines. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/dbm/tests/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** Makefile.in 29 Jun 2004 10:09:28 -0000 1.1.1.2 --- Makefile.in 11 Oct 2004 20:35:11 -0000 1.2 *************** *** 43,46 **** --- 43,50 ---- LIBS = $(EXTRA_DSO_LIBS) + + ifeq ($(OS_ARCH),AmigaOS) + FORCE_NO_PIC = 1 + endif include $(topsrcdir)/config/rules.mk |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:34:12
|
Update of /cvsroot/amizilla/amizilla/db/mork/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24414 Modified Files: morkConfig.h morkFile.cpp morkStream.cpp Log Message: AmigaOS defines. Index: morkFile.cpp =================================================================== RCS file: /cvsroot/amizilla/amizilla/db/mork/src/morkFile.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** morkFile.cpp 29 Jun 2004 10:04:41 -0000 1.1.1.2 --- morkFile.cpp 11 Oct 2004 20:33:54 -0000 1.2 *************** *** 284,292 **** # define morkFile_kNewlinesCount 8 # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) static const char morkFile_kNewlines[] = "\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012"; # define morkFile_kNewlinesCount 16 ! # endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ --- 284,292 ---- # define morkFile_kNewlinesCount 8 # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) || defined(MORK_AMIGAOS) static const char morkFile_kNewlines[] = "\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012\012"; # define morkFile_kNewlinesCount 16 ! # endif /* MORK_UNIX || MORK_BEOS || MORK_AMIGAOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ Index: morkConfig.h =================================================================== RCS file: /cvsroot/amizilla/amizilla/db/mork/src/morkConfig.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** morkConfig.h 29 Jun 2004 10:04:47 -0000 1.1.1.2 --- morkConfig.h 11 Oct 2004 20:33:54 -0000 1.2 *************** *** 74,80 **** #endif // } %%%%% end platform defs peculiar to Mork %%%%% ! #if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) || defined(MORK_OS2) #include <stdio.h> #include <ctype.h> --- 74,84 ---- #endif + #ifdef XP_AMIGAOS + #define MORK_AMIGAOS 1 + #endif + // } %%%%% end platform defs peculiar to Mork %%%%% ! #if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) || defined(MORK_OS2) || defined(MORK_AMIGAOS) #include <stdio.h> #include <ctype.h> *************** *** 145,149 **** # define mork_kNewlineSize 2 # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) # define mork_kNewline "\012" # define mork_kNewlineSize 1 --- 149,153 ---- # define mork_kNewlineSize 2 # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) || defined(MORK_AMIGAOS) # define mork_kNewline "\012" # define mork_kNewlineSize 1 *************** *** 164,168 **** /*define MORK_USE_XP_STDLIB 1*/ ! #if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) || defined(MORK_OS2) #define MORK_USE_C_STDLIB 1 #endif /*MORK_WIN*/ --- 168,172 ---- /*define MORK_USE_XP_STDLIB 1*/ ! #if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC) || defined(MORK_BEOS) || defined(MORK_OS2) || defined(MORK_AMIGAOS) #define MORK_USE_C_STDLIB 1 #endif /*MORK_WIN*/ Index: morkStream.cpp =================================================================== RCS file: /cvsroot/amizilla/amizilla/db/mork/src/morkStream.cpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** morkStream.cpp 22 Jun 2003 11:29:21 -0000 1.1.1.1 --- morkStream.cpp 11 Oct 2004 20:33:54 -0000 1.2 *************** *** 329,338 **** # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) this->Putc(ev, mork_kLF); return 1; ! # endif /* MORK_UNIX || MORK_BEOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ --- 329,338 ---- # else ! # if defined(MORK_UNIX) || defined(MORK_BEOS) || defined(MORK_AMIGAOS) this->Putc(ev, mork_kLF); return 1; ! # endif /* MORK_UNIX || MORK_BEOS || MORK_AMIGAOS */ # endif /* MORK_WIN */ #endif /* MORK_MAC */ |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:32:37
|
Update of /cvsroot/amizilla/amizilla/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23944 Modified Files: rules.mk config.mk Log Message: AmigaOS shared library support. Index: rules.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/config/rules.mk,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** rules.mk 29 Jun 2004 10:58:57 -0000 1.1.1.2 --- rules.mk 11 Oct 2004 20:32:17 -0000 1.2 *************** *** 148,151 **** --- 148,158 ---- SHARED_LIBRARY := $(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX) + ifeq ($(OS_ARCH), AmigaOS) + LIBRARY_X := $(LIBRARY_NAME).x + LIBRARY_IX_SHLIB := $(LIBRARY_NAME).ix + LIBRARY_IX := $(LIB_PREFIX)$(LIBRARY_NAME)_ixlibrary.a + LIBRARY_H := $(LIBRARY_NAME).h + endif + ifeq ($(OS_ARCH),OS2) DEF_FILE := $(SHARED_LIBRARY:.dll=.def) *************** *** 166,169 **** --- 173,180 ---- ifeq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)) SHARED_LIBRARY := $(NULL) + LIBRARY_X := $(NULL) + LIBRARY_IX := $(NULL) + LIBRARY_IX_SHLIB := $(NULL) + LIBRARY_H := $(NULL) DEF_FILE := $(NULL) IMPORT_LIBRARY := $(NULL) *************** *** 173,178 **** --- 184,202 ---- ifndef FORCE_SHARED_LIB SHARED_LIBRARY := $(NULL) + LIBRARY_X := $(NULL) + LIBRARY_IX := $(NULL) + LIBRARY_IX_SHLIB := $(NULL) + LIBRARY_H := $(NULL) DEF_FILE := $(NULL) IMPORT_LIBRARY := $(NULL) + ifeq ($(OS_ARCH), AmigaOS) + ifdef BUILD_SHARED_LIBS + + ifneq ($(MODULE), xpcom) + # HACK. I don't need these when building xpcom! + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + endif + endif + endif endif endif *************** *** 262,265 **** --- 286,290 ---- $(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \ $(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \ + $(LIBRARY_X) $(LIBRARY_IX) $(LIBRARY_H) $(LIBRARY_IX_SHLIB) \ $(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \ $(PROGRAM:$(BIN_SUFFIX)=.exp) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.exp) \ *************** *** 649,653 **** ############################################## ! libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS) ifndef NO_DIST_INSTALL ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) --- 674,678 ---- ############################################## ! libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS) $(LIBRARY_IX_SHLIB) ifndef NO_DIST_INSTALL ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB)) *************** *** 696,699 **** --- 721,729 ---- endif endif # GRE_MODULE + ifeq ($(OS_ARCH),AmigaOS) + $(INSTALL) $(IFLAGS2) $(LIBRARY_X) $(DIST)/lib + $(INSTALL) $(IFLAGS2) $(LIBRARY_IX) $(DIST)/lib + $(INSTALL) $(IFLAGS2) $(LIBRARY_H) $(DIST)/include + else ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) $(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib *************** *** 701,704 **** --- 731,736 ---- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib endif + endif + ifndef _SKIP_OLD_GRE_INSTALL $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin *************** *** 794,797 **** --- 826,839 ---- endif # NO_INSTALL + ifdef LIBRARY_IX_SHLIB + $(SHARED_LIBRARY) : $(LIBRARY_IX_SHLIB) + + $(LIBRARY_IX_SHLIB): $(topsrcdir)/config/autoconf.mk + MOZILLA_MAJOR_VERSION=`echo $(MOZILLA_VERSION) |cut -d '.' -f 1`; \ + MOZILLA_MINOR_VERSION=`echo $(MOZILLA_VERSION) |cut -d '.' -f 2`; \ + echo \#define VERSION $$MOZILLA_MAJOR_VERSION > $(LIBRARY_IX_SHLIB); \ + echo \#define REVISION $$MOZILLA_MINOR_VERSION >> $(LIBRARY_IX_SHLIB) + endif + checkout: $(MAKE) -C $(topsrcdir) -f client.mk checkout Index: config.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/config/config.mk,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** config.mk 29 Jun 2004 10:58:51 -0000 1.1.1.2 --- config.mk 11 Oct 2004 20:32:17 -0000 1.2 *************** *** 441,445 **** --- 441,448 ---- #ifeq (,$(PROGRAM)$(SIMPLE_PROGRAMS)$(HOST_PROGRAM)$(HOST_SIMPLE_PROGRAMS)) ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC)) + ifeq (, $(FORCE_NO_PIC)) _ENABLE_PIC=1 + else + endif endif #endif |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 20:31:51
|
Update of /cvsroot/amizilla/amizilla In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23625 Modified Files: configure configure.in Log Message: AmigaOS shared library support. Index: configure =================================================================== RCS file: /cvsroot/amizilla/amizilla/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 18 Jul 2004 01:40:36 -0000 1.5 --- configure 11 Oct 2004 20:31:32 -0000 1.6 *************** *** 4670,4673 **** --- 4670,4674 ---- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; mingw*) OS_ARCH=WINNT ;; + amigaos*) OS_ARCH=AmigaOS OS_RELEASE=3.1 ;; esac else *************** *** 4846,4850 **** if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 [...5558 lines suppressed...] else --- 16590,16594 ---- ; return 0; } EOF ! if { (eval echo configure:16593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else *************** *** 16600,16604 **** EOF ! elif test "$OS_ARCH" = "amigaos" -o "$OS_ARCH" != "AmigaOS"; then cat >> confdefs.h <<\EOF #define XP_AMIGAOS 1 --- 16630,16634 ---- EOF ! elif test "$OS_ARCH" = "AmigaOS"; then cat >> confdefs.h <<\EOF #define XP_AMIGAOS 1 Index: configure.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 18 Jul 2004 01:40:36 -0000 1.3 --- configure.in 11 Oct 2004 20:31:34 -0000 1.4 *************** *** 595,598 **** --- 595,599 ---- solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; mingw*) OS_ARCH=WINNT ;; + amigaos*) OS_ARCH=AmigaOS OS_RELEASE=3.1 ;; esac else *************** *** 1590,1594 **** HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"' ;; ! esac --- 1591,1598 ---- HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"' ;; ! *-amigaos*) ! LDFLAGS="-noixemul" ! DLL_SUFFIX=".ixlibrary" ! ;; esac *************** *** 2007,2014 **** esac fi - AC_CHECK_LIB(socket, socket) ! XLDFLAGS="$X_LIBS" ! XLIBS="$X_EXTRA_LIBS" dnl ======================================================== --- 2011,2024 ---- esac fi ! case "$target" in ! *-amigaos) ! ;; ! *) ! AC_CHECK_LIB(socket, socket) ! XLDFLAGS="$X_LIBS" ! XLIBS="$X_EXTRA_LIBS"; ! ;; ! esac dnl ======================================================== *************** *** 4968,4971 **** --- 4978,5001 ---- fi + case "${target}" in + *-amigaos*) + if test -n "$BUILD_SHARED_LIBS" ; then + MKSHLIB='a2ixlibrary -cpp -32 -dso -o $@' + MKCSHLIB='a2ixlibrary -32 -dso -o $@' + DSO_CFLAGS="-m68020 -fbaserel32" + DSO_PIC_CFLAGS="-malways-restore-a4 -Uerrno" + DSO_LDOPTS="" + CXX=a2ixg++ + CXXFLAGS="$CXXFLAGS \$(EXTRA_DSO_LDOPTS)" + else + DSO_PIC_CFLAGS="" + DSO_CFLAGS="" + DSO_LDOPTS="" + MKSHLIB= + MKCSHLIB= + fi + ;; + esac + dnl ======================================================== dnl static component loader *************** *** 5645,5649 **** elif test "$OS_ARCH" = "OpenVMS"; then AC_DEFINE(XP_UNIX) ! elif test "$OS_ARCH" = "amigaos" -o "$OS_ARCH" != "AmigaOS"; then AC_DEFINE(XP_AMIGAOS) elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then --- 5675,5679 ---- elif test "$OS_ARCH" = "OpenVMS"; then AC_DEFINE(XP_UNIX) ! elif test "$OS_ARCH" = "AmigaOS"; then AC_DEFINE(XP_AMIGAOS) elif test "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2"; then |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 19:04:24
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/memory In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4013/pr/src/memory Modified Files: prshma.c Log Message: Fixed comment regarding source location. Index: prshma.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/memory/prshma.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prshma.c 3 Jul 2003 09:16:34 -0000 1.2 --- prshma.c 11 Oct 2004 19:04:12 -0000 1.3 *************** *** 46,50 **** /* defined in pr/src/md/unix/uxshm.c */ #elif defined(XP_AMIGAOS) ! /* defined in pr/src/md/unix/uxshm.c */ #elif defined(WIN32) /* defined in pr/src/md/windows/w32shm.c */ --- 46,50 ---- /* defined in pr/src/md/unix/uxshm.c */ #elif defined(XP_AMIGAOS) ! /* defined in pr/src/md/amiga/afile.c */ #elif defined(WIN32) /* defined in pr/src/md/windows/w32shm.c */ |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 19:03:40
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3852/pr/src Modified Files: Makefile.in Log Message: AmigaOS doesn't need prthinfo.o Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 26 Mar 2004 04:50:39 -0000 1.2 --- Makefile.in 11 Oct 2004 19:03:28 -0000 1.3 *************** *** 253,261 **** misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ - misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX) # ilib now rejects empty objects ifneq ($(MOZ_OS2_TOOLS),VACPP) --- 253,264 ---- misc/$(OBJDIR)/prrng.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prsystem.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtpool.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtrace.$(OBJ_SUFFIX) \ misc/$(OBJDIR)/prtime.$(OBJ_SUFFIX) + ifneq ($(OS_ARCH), AmigaOS) + OBJS += misc/$(OBJDIR)/prthinfo.$(OBJ_SUFFIX) + endif + # ilib now rejects empty objects ifneq ($(MOZ_OS2_TOOLS),VACPP) *************** *** 405,408 **** --- 408,412 ---- export:: $(TARGETS) $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) + ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) *************** *** 412,415 **** --- 416,422 ---- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) endif + ifeq ($(OS_ARCH), AmigaOS) + $(INSTALL) -m 444 $(IMPORT_LIBRARY_H) $(dist_includedir) + endif endif ifeq ($(MOZ_BITS),16) |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 19:01:17
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3064 Modified Files: Makefile.in Log Message: AmigaOS linking defines. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/tests/Makefile.in,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** Makefile.in 29 Jun 2004 11:35:53 -0000 1.1.1.2 --- Makefile.in 11 Oct 2004 19:00:59 -0000 1.2 *************** *** 78,82 **** formattm.c \ fsync.c \ ! getai.c \ gethost.c \ getproto.c \ --- 78,82 ---- formattm.c \ fsync.c \ ! getai.c \ gethost.c \ getproto.c \ *************** *** 432,435 **** --- 432,440 ---- endif + ifeq ($(OS_ARCH),AmigaOS) + EXTRA_LIBS += -noixemul + OS_CFLAGS = $(OS_CPPFLAGS) -pipe -m68020-60 -g + endif + ifeq ($(USE_PTHREADS),1) LIBPTHREAD = -lpthread |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:58:41
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2238 Modified Files: prnetdb.c Log Message: Amiga netdb defines. Index: prnetdb.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/misc/prnetdb.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** prnetdb.c 1 Sep 2004 09:30:27 -0000 1.4 --- prnetdb.c 11 Oct 2004 18:58:27 -0000 1.5 *************** *** 42,50 **** * errno. */ ! #if defined(XP_UNIX) || defined(XP_AMIGAOS) #if defined(_PR_NEED_H_ERRNO) extern int h_errno; #endif #define _MD_GETHOST_ERRNO() h_errno #else #define _MD_GETHOST_ERRNO() _MD_ERRNO() --- 42,52 ---- * errno. */ ! #if defined(XP_UNIX) #if defined(_PR_NEED_H_ERRNO) extern int h_errno; #endif #define _MD_GETHOST_ERRNO() h_errno + #elif defined(XP_AMIGAOS) + #define _MD_GETHOST_ERRNO() ami_host_errno() #else #define _MD_GETHOST_ERRNO() _MD_ERRNO() |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:58:04
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/linking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2087/pr/src/linking Modified Files: prlink.c Log Message: Load and resolve Amiga shared libraries. Index: prlink.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/linking/prlink.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prlink.c 23 Jun 2003 09:14:36 -0000 1.2 --- prlink.c 11 Oct 2004 18:57:48 -0000 1.3 *************** *** 63,66 **** --- 63,83 ---- #endif + #if defined(XP_AMIGAOS) + #include <proto/exec.h> + #include <proto/dos.h> + struct IXLibrary { + struct Library ix_Lib; + UWORD ix_Flags; + ULONG ix_Cookie; + /* Other stuff here but I don't care */ + }; + + #define DLD_GetSymbol(lib, func) \ + LP1(42, void *, DLD_GetSymbol, const char *, func, a2,, lib) + + extern void SETVARSINST(struct IXLibrary *lib __asm("a0"), int argc, void (*func)(int)); + + #endif + #ifdef XP_UNIX #ifdef USE_DLFCN *************** *** 214,218 **** #ifdef XP_AMIGAOS ! void* dlh; #endif --- 231,235 ---- #ifdef XP_AMIGAOS ! struct IXLibrary* dlh; #endif *************** *** 548,552 **** } #endif ! #if defined(XP_UNIX) || defined(XP_BEOS) if (strstr(lib, PR_DLL_SUFFIX) == NULL) { --- 565,569 ---- } #endif ! #if defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_AMIGAOS) if (strstr(lib, PR_DLL_SUFFIX) == NULL) { *************** *** 1170,1173 **** --- 1187,1205 ---- #endif + #ifdef XP_AMIGAOS + lm->dlh = (struct IXLibrary *)OpenLibrary(name, 0); + if (lm->dlh == NULL || lm->dlh->ix_Cookie != 0x4a535300) { + if (lm->dlh) { + CloseLibrary(lm->dlh); + } + PR_DELETE(lm); + goto unlock; + } + SETVARSINST(lm->dlh, 1, exit); + lm->name = strdup(name); + lm->next = pr_loadmap; + pr_loadmap = lm; + #endif + result = lm; /* success */ PR_LOG(_pr_linker_lm, PR_LOG_MIN, ("Loaded library %s (load lib)", lm->name)); *************** *** 1388,1391 **** --- 1420,1428 ---- #endif + #ifdef XP_AMIGAOS + if (lib->dlh) + CloseLibrary((struct Library *)lib->dlh); + #endif + /* unlink from library search list */ if (pr_loadmap == lib) *************** *** 1543,1546 **** --- 1580,1592 ---- #endif /* HAVE_DLL */ #endif /* XP_UNIX */ + + #ifdef XP_AMIGAOS + f = DLD_GetSymbol((struct Library *)lm->dlh,name); + if (f == NULL) { + extern int errno; + errno = 15; + } + #endif + if (f == NULL) { PR_SetError(PR_FIND_SYMBOL_ERROR, _MD_ERRNO()); |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:57:23
|
Update of /cvsroot/amizilla/amizilla/nsprpub/lib/libc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1873/lib/libc/src Added Files: plc4.ix Log Message: Shared library linking file. --- NEW FILE: plc4.ix --- #define VERSION 4 #define REVISION 1 |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:57:19
|
Update of /cvsroot/amizilla/amizilla/nsprpub/lib/ds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1873/lib/ds Added Files: plds4.ix Log Message: Shared library linking file. --- NEW FILE: plds4.ix --- #define VERSION 4 #define REVISION 1 |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:57:19
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/tests/dll In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1873/pr/tests/dll Added Files: my.ix Log Message: Shared library linking file. --- NEW FILE: my.ix --- #define REVISION 1 #define VERSION 1 |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:57:19
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1873/pr/src Added Files: nspr4.ix Log Message: Shared library linking file. --- NEW FILE: nspr4.ix --- #define VERSION 4 #define REVISION 1 |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:56:23
|
Update of /cvsroot/amizilla/amizilla/nsprpub/lib/ds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1376/lib/ds Modified Files: Makefile.in Log Message: Copy the shared library header file into the appropriate directory. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/lib/ds/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 22 Jun 2003 14:17:23 -0000 1.1.1.1 --- Makefile.in 11 Oct 2004 18:56:02 -0000 1.2 *************** *** 186,189 **** --- 186,192 ---- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) endif + ifeq ($(OS_ARCH), AmigaOS) + $(INSTALL) -m 444 $(IMPORT_LIBRARY_H) $(dist_includedir) + endif endif ifeq ($(MOZ_BITS),16) |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:56:23
|
Update of /cvsroot/amizilla/amizilla/nsprpub/lib/libc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1376/lib/libc/src Modified Files: Makefile.in Log Message: Copy the shared library header file into the appropriate directory. Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/lib/libc/src/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.in 22 Jun 2003 14:17:24 -0000 1.1.1.1 --- Makefile.in 11 Oct 2004 18:56:03 -0000 1.2 *************** *** 188,191 **** --- 188,194 ---- $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir) endif + ifeq ($(OS_ARCH), AmigaOS) + $(INSTALL) -m 444 $(IMPORT_LIBRARY_H) $(dist_includedir) + endif endif ifeq ($(MOZ_BITS),16) |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:55:41
|
Update of /cvsroot/amizilla/amizilla/nsprpub/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1190/config Modified Files: rules.mk Log Message: We can now compile shared libraries on the Amiga. Added the appropriate defines to copy the auxillary files with the shared library. Index: rules.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/config/rules.mk,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rules.mk 19 Jul 2003 11:09:22 -0000 1.3 --- rules.mk 11 Oct 2004 18:55:26 -0000 1.4 *************** *** 122,130 **** SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a else - ifneq (,$(filter-out AMIGAOS AmigaOS,$(OS_ARCH))) ifdef MKSHLIB SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) endif endif endif --- 122,135 ---- SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr.a else ifdef MKSHLIB SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) endif + + ifeq ($(OS_ARCH), AmigaOS) + IMPORT_LIBRARY_X = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).x + IMPORT_LIBRARY_A = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_ixlibrary.a + IMPORT_LIBRARY_H = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).h endif + endif *************** *** 136,142 **** --- 141,151 ---- TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) else + ifeq ($(OS_ARCH), AmigaOS) + TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY_X) $(IMPORT_LIBRARY_A) + else TARGETS = $(LIBRARY) $(SHARED_LIBRARY) endif endif + endif # |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:54:51
|
Update of /cvsroot/amizilla/amizilla/nsprpub/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1015/config Modified Files: AmigaOS.mk Log Message: Added the appropriate share library defines. Index: AmigaOS.mk =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/config/AmigaOS.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AmigaOS.mk 3 Apr 2004 20:11:02 -0000 1.1 --- AmigaOS.mk 11 Oct 2004 18:54:37 -0000 1.2 *************** *** 93,98 **** endef ! MKSHLIB = $(LD) $(DSO_LDOPTS) -o $@ ! DSO_LDOPTS = -r -amiga-debug-hunk ! OS_LIBS = -g -ldld --- 93,97 ---- endef ! MKSHLIB = a2ixlibrary -32 -o $@ ! DSO_CFLAGS = -m68020 -fbaserel -malways-restore-a4 -Uerrno |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:54:13
|
Update of /cvsroot/amizilla/amizilla/nsprpub In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv755 Modified Files: configure configure.in Log Message: Added the appropriate cross-compilation defines (stolen from top-level configure) Set the appropriate shared memory flags for AmigaOS. Index: configure =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 26 Mar 2004 04:33:44 -0000 1.5 --- configure 11 Oct 2004 18:54:01 -0000 1.6 *************** *** 2751,2757 **** ASFLAGS='$(CFLAGS)' ! OS_ARCH=`uname -s | sed -e 's|/|_|g'` ! OS_RELEASE=`uname -r` ! OS_TEST=`uname -m` if test "$OS_ARCH" = "IRIX64"; then --- 2751,2770 ---- ASFLAGS='$(CFLAGS)' ! if test -n "$CROSS_COMPILE"; then ! OS_TARGET="${target_os}" ! OS_ARCH=`echo $target_os | sed -e 's|/|_|g'` ! OS_RELEASE= ! OS_TEST="${target_cpu}" ! case "${target_os}" in ! linux*) OS_ARCH=Linux ;; ! solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ! mingw*) OS_ARCH=WINNT ;; ! amigaos*) OS_ARCH=AmigaOS OS_RELEASE=3.1 ;; ! esac ! else ! OS_ARCH=`uname -s | sed -e 's|/|_|g'` ! OS_RELEASE=`uname -r` ! OS_TEST=`uname -m` ! fi if test "$OS_ARCH" = "IRIX64"; then *************** *** 2929,2943 **** ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2932: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 2937 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 2942,2956 ---- ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 ! echo "configure:2945: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 2950 "configure" #include "confdefs.h" #include <sys/atomic_op.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 3103,3107 **** MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3106: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 3116,3120 ---- MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 ! echo "configure:3119: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 3111,3115 **** LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3114 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 3124,3128 ---- LIBS="-lbind $LIBS" cat > conftest.$ac_ext <<EOF ! #line 3127 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 3122,3126 **** ; return 0; } EOF ! if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 3135,3139 ---- ; return 0; } EOF ! if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 4305,4319 **** ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4308: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4313 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then --- 4318,4332 ---- ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 ! echo "configure:4321: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4326 "configure" #include "confdefs.h" #include <machine/builtins.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:4331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then *************** *** 4828,4837 **** echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4831: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4836 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4841,4850 ---- echo $ac_n "checking for dlopen""... $ac_c" 1>&6 ! echo "configure:4844: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4849 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 4856,4860 **** ; return 0; } EOF ! if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" --- 4869,4873 ---- ; return 0; } EOF ! if { (eval echo configure:4872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" *************** *** 4875,4879 **** echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4878: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 4888,4892 ---- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 ! echo "configure:4891: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 4883,4887 **** LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4886 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ --- 4896,4900 ---- LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF ! #line 4899 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 4894,4898 **** ; return 0; } EOF ! if { (eval echo configure:4897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 4907,4911 ---- ; return 0; } EOF ! if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 4922,4926 **** if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4925: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 4935,4939 ---- if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ! echo "configure:4938: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 4928,4932 **** ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4931 "configure" #include "confdefs.h" #include <sgtty.h> --- 4941,4945 ---- ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF ! #line 4944 "configure" #include "confdefs.h" #include <sgtty.h> *************** *** 4946,4950 **** if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4949 "configure" #include "confdefs.h" #include <termio.h> --- 4959,4963 ---- if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF ! #line 4962 "configure" #include "confdefs.h" #include <termio.h> *************** *** 4970,4979 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4973: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4978 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, --- 4983,4992 ---- do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:4986: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF ! #line 4991 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, *************** *** 4998,5002 **** ; return 0; } EOF ! if { (eval echo configure:5001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 5011,5015 ---- ; return 0; } EOF ! if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 5037,5041 **** echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5040: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 5050,5054 ---- echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 ! echo "configure:5053: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 5071,5075 **** echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5074: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> --- 5084,5088 ---- echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 ! echo "configure:5087: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> *************** *** 5093,5097 **** echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5096: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> --- 5106,5110 ---- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 ! echo "configure:5109: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> *************** *** 5115,5119 **** echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5118: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> --- 5128,5132 ---- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 ! echo "configure:5131: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> *************** *** 5137,5141 **** echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5140: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> --- 5150,5154 ---- echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 ! echo "configure:5153: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> *************** *** 5289,5293 **** ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5292: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 --- 5302,5306 ---- ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 ! echo "configure:5305: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 *************** *** 5312,5316 **** if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5315: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 --- 5325,5329 ---- if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 ! echo "configure:5328: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 *************** *** 5432,5435 **** --- 5445,5453 ---- PR_MD_ARCH_DIR=amiga USE_ATHREADS=1 + MKSHLIB='a2ixlibrary -cpp -32 -dso -o $@' + DSO_CFLAGS="-m68020 -fbaserel32 -malways-restore-a4 -Uerrno" + CXX=a2ixg++ + DLL_SUFFIX="ixlibrary" + LDFLAGS="-noixemul" CFLAGS="$CFLAGS -m68020-60" CXXFLAGS="$CXXFLAGS -m68020-60" Index: configure.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.in 26 Mar 2004 04:33:44 -0000 1.2 --- configure.in 11 Oct 2004 18:54:01 -0000 1.3 *************** *** 525,531 **** ASFLAGS='$(CFLAGS)' ! OS_ARCH=`uname -s | sed -e 's|/|_|g'` ! OS_RELEASE=`uname -r` ! OS_TEST=`uname -m` if test "$OS_ARCH" = "IRIX64"; then --- 525,544 ---- ASFLAGS='$(CFLAGS)' ! if test -n "$CROSS_COMPILE"; then ! OS_TARGET="${target_os}" ! OS_ARCH=`echo $target_os | sed -e 's|/|_|g'` ! OS_RELEASE= ! OS_TEST="${target_cpu}" ! case "${target_os}" in ! linux*) OS_ARCH=Linux ;; ! solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; ! mingw*) OS_ARCH=WINNT ;; ! amigaos*) OS_ARCH=AmigaOS OS_RELEASE=3.1 ;; ! esac ! else ! OS_ARCH=`uname -s | sed -e 's|/|_|g'` ! OS_RELEASE=`uname -r` ! OS_TEST=`uname -m` ! fi if test "$OS_ARCH" = "IRIX64"; then *************** *** 2229,2232 **** --- 2242,2250 ---- PR_MD_ARCH_DIR=amiga USE_ATHREADS=1 + MKSHLIB='a2ixlibrary -cpp -32 -dso -o $@' + DSO_CFLAGS="-m68020 -fbaserel32 -malways-restore-a4 -Uerrno" + CXX=a2ixg++ + DLL_SUFFIX="ixlibrary" + LDFLAGS="-noixemul" CFLAGS="$CFLAGS -m68020-60" CXXFLAGS="$CXXFLAGS -m68020-60" |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:50:52
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31794 Modified Files: asocket.c Log Message: errno -> rerrno incase we define errno. Added replacement functions for gethostbyname, gethostbyaddr, inet_addr, getprotobyname, getprotobynumber, Index: asocket.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/asocket.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** asocket.c 4 Jul 2004 22:39:26 -0000 1.25 --- asocket.c 11 Oct 2004 18:50:39 -0000 1.26 *************** *** 52,56 **** /* DEBUG sockets */ ! #define DEBUG_ASOCKET /* --- 52,56 ---- /* DEBUG sockets */ ! /*#define DEBUG_ASOCKET */ /* *************** *** 123,127 **** /* Reply from the socket thread */ struct ReplyMsg { ! PRInt32 errno; /* Any errors encountered */ union { --- 123,127 ---- /* Reply from the socket thread */ struct ReplyMsg { ! PRInt32 rerrno; /* Any errors encountered */ union { *************** *** 162,165 **** --- 162,168 ---- /* Destructor for the ThreadPrivate socket descriptor */ static void closeOpenSocketDTOR(void *prm) { + #ifdef DEBUG_SOCKET + printf("closeOpenSocketDTOR %lx\n", prm); + #endif PRThread *me = PR_GetCurrentThread(); if (me->state != _PR_DEAD_STATE) { *************** *** 186,190 **** PR_Lock(msgLock); #ifdef DEBUG_ASOCKET ! printf("msgLock is %lx, replyLock is %lx, communicationslock is %lx, msgCondVar is %lx, replyCondVar is %lx\n", msgLock, replyLock, communicationLock, msgCondVar, replyCondVar); #endif sockThread = PR_CreateThread(PR_SYSTEM_THREAD, --- 189,193 ---- PR_Lock(msgLock); #ifdef DEBUG_ASOCKET ! printf("msgLock is %lx, replyLock is %lx, communicationslock is %lx, msgCondVar is %lx, replyCondVar is %lx, closeOpenSocketDTOR is %lx\n", msgLock, replyLock, communicationLock, msgCondVar, replyCondVar, closeOpenSocketDTOR); #endif sockThread = PR_CreateThread(PR_SYSTEM_THREAD, *************** *** 364,371 **** } else { #ifdef DEBUG_ASOCKET ! printf("sendSocketToThread(%lx) error %d\n", reply.errno); #endif retval = PR_FAILURE; ! PR_SetError(PR_UNKNOWN_ERROR, reply.errno); PR_Lock(msgLock); msg.type = MSG_CLOSE; --- 367,374 ---- } else { #ifdef DEBUG_ASOCKET ! printf("sendSocketToThread(%lx) error %d\n", reply.rerrno); #endif retval = PR_FAILURE; ! PR_SetError(PR_UNKNOWN_ERROR, reply.rerrno); PR_Lock(msgLock); msg.type = MSG_CLOSE; *************** *** 447,457 **** } else { reply.msg.obtain.id = -1; ! reply.errno = TCP_Errno(); #ifdef DEBUG_ASOCKET ! printf("Dup2socket failed: %d\n", reply.errno); #endif } } else { ! reply.errno = EBADF; } break; --- 450,460 ---- } else { reply.msg.obtain.id = -1; ! reply.rerrno = TCP_Errno(); #ifdef DEBUG_ASOCKET ! printf("Dup2socket failed: %d\n", reply.rerrno); #endif } } else { ! reply.rerrno = EBADF; } break; *************** *** 480,484 **** ss = PR_NEWZAP(struct SharedSocket); if (ss == NULL) { ! reply.errno = ENOMEM; break; } --- 483,487 ---- ss = PR_NEWZAP(struct SharedSocket); if (ss == NULL) { ! reply.rerrno = ENOMEM; break; } *************** *** 501,505 **** if (ss->fd < 0) { ! reply.errno = TCP_Errno(); PR_Free(ss); } else { --- 504,508 ---- if (ss->fd < 0) { ! reply.rerrno = TCP_Errno(); PR_Free(ss); } else { *************** *** 514,518 **** } else { reply.msg.receive.private_idx = -1; ! reply.errno = ENFILE; PR_Free(ss); } --- 517,521 ---- } else { reply.msg.receive.private_idx = -1; ! reply.rerrno = ENFILE; PR_Free(ss); } *************** *** 615,621 **** } else { #ifdef DEBUG_ASOCKET ! printf("Obtained failed %d\n", reply.errno); #endif ! PR_SetError(PR_UNKNOWN_ERROR, reply.errno); PR_Free(ss); ss = NULL; --- 618,624 ---- } else { #ifdef DEBUG_ASOCKET ! printf("Obtained failed %d\n", reply.rerrno); #endif ! PR_SetError(PR_UNKNOWN_ERROR, reply.rerrno); PR_Free(ss); ss = NULL; *************** *** 726,730 **** int err = TCP_Errno(); #ifdef DEBUG_ASOCKET ! printf("Connect(%lx) returned %d, errno is %d\n", me, retval, err); #endif /* All done */ --- 729,733 ---- int err = TCP_Errno(); #ifdef DEBUG_ASOCKET ! printf("Connect(%lx) returned %d, rerrno is %d\n", me, retval, err); #endif /* All done */ *************** *** 1839,1840 **** --- 1842,1895 ---- } } + + /* replacements for the originals */ + struct hostent *gethostbyname(const char *name) { + PRThread *me = PR_GetCurrentThread(); + + if (AMITCP_BASE_NAME) { + return TCP_GetHostByName(name); + } else { + return NULL; + } + } + + struct hostent *gethostbyaddr(const char *addr, int len, int type) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_GetHostByAddr(addr, len, type); + } else { + return NULL; + } + } + + struct protoent *getprotobyname(const char *name) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_GetProtoByName(name); + } else { + return NULL; + } + } + + struct protoent *getprotobynumber(int proto) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_GetProtoByNumber(proto); + } else { + return NULL; + } + } + + unsigned long inet_addr(const char *cp) { + PRThread *me = PR_GetCurrentThread(); + if (AMITCP_BASE_NAME) { + return TCP_Inet_Addr(cp); + } else { + return NULL; + } + } + + int ami_host_errno() { + PRThread *me = PR_GetCurrentThread(); + return TCP_Errno(); + } |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:46:55
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31023 Modified Files: arandom.c Log Message: Moved the interrupt code into ainput.c No longer uses functions from amiga.lib Added debugging info. The variables used by the interrupt routine are now in a structure instead of global variables. Index: arandom.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/arandom.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** arandom.c 6 Aug 2004 09:07:23 -0000 1.4 --- arandom.c 11 Oct 2004 18:46:39 -0000 1.5 *************** *** 37,41 **** #include <devices/inputevent.h> #include <devices/input.h> ! #include <exec/interrupts.h> /* Code dealing with random numbers */ --- 37,42 ---- #include <devices/inputevent.h> #include <devices/input.h> ! ! /* #define DEBUG_ARANDOM */ /* Code dealing with random numbers */ *************** *** 61,100 **** */ ! volatile int data[5]; ! volatile int num = 0; ! ! /* Input handler which does gathers the data and signals the ! * InputEventThread ! * Input - a0 - InputEvent structure ! * Input - a1 - use data (in my case the Process of the InputEventThread) ! * Output - d0 the new InputEvent structure (it is always the same as the input) ! */ ! static struct InputEvent *InputEventHandler(void) { ! register struct InputEvent *ie __asm("a0"); ! struct InputEvent *ie2 = ie; ! register struct Process *p __asm("a1"); ! register struct InputEvent *retval __asm("d0"); ! int pos = 0; ! while (ie && pos < 5) { ! switch (ie->ie_Class) { ! case IECLASS_RAWKEY: ! data[pos] = ie->ie_Code | (int)ie->ie_position.ie_addr; ! default: ! data[pos] = (int)ie->ie_position.ie_addr; ! } ! ie = ie->ie_NextEvent; ! if (data[pos]) ! pos++; ! } ! ! if (pos) { ! num = pos; ! Signal((struct Task *)p, SIGBREAKF_CTRL_F); ! } ! retval = ie2; ! return retval; ! } ! /* * NSPR Input Event thread --- 62,68 ---- */ ! struct InputEvent *InputEventHandler(struct InputEvent *ie __asm("a0"), struct Process *p __asm("a1")); + static struct InputData ip; /* * NSPR Input Event thread *************** *** 107,111 **** struct MsgPort *mp = CreateMsgPort(); struct IOStdReq *io = (struct IOStdReq *) ! CreateExtIO(mp, sizeof(struct IOStdReq)); struct Interrupt *ie = PR_NEWZAP(struct Interrupt); PRThread *me = PR_CurrentThread(); --- 75,79 ---- struct MsgPort *mp = CreateMsgPort(); struct IOStdReq *io = (struct IOStdReq *) ! CreateIORequest(mp, sizeof(struct IOStdReq)); struct Interrupt *ie = PR_NEWZAP(struct Interrupt); PRThread *me = PR_CurrentThread(); *************** *** 113,118 **** OpenDevice("input.device", 0, (struct IORequest *)io, 0); ie->is_Code = InputEventHandler; ! ie->is_Data = me->p; ie->is_Node.ln_Pri = 100; ie->is_Node.ln_Name = "NSPR Input/Random handler"; --- 81,87 ---- OpenDevice("input.device", 0, (struct IORequest *)io, 0); + ip.p = me->p; ie->is_Code = InputEventHandler; ! ie->is_Data = &ip; ie->is_Node.ln_Pri = 100; ie->is_Node.ln_Name = "NSPR Input/Random handler"; *************** *** 122,126 **** --- 91,97 ---- DoIO((struct IORequest *)io); + #ifdef DEBUG_ARANDOM printf("Added event handler\n"); + #endif while (!done) { int mynum; *************** *** 133,137 **** --- 104,110 ---- me->state = _PR_RUNNING; if (flags & 1 << me->port->mp_SigBit) { + #ifdef DEBUG_ARANDOM printf("event thread got interrupted\n"); + #endif done = PR_TRUE; break; *************** *** 140,158 **** SetSignal(0, flags); /* Make a copy of the data to be safe */ ! mynum = num; ! memcpy(mydata, data, sizeof(mydata)); Enable(); printf("Got %d pieces of random data\n", mynum); PR_Lock(listLock); for (i = 0; i < mynum; i++) { int j; int d = mydata[i]; for (j = 0; j < 4; j++) { while ((front - back % BUFFERSIZE) == BUFFERSIZE -1) { printf("Full, waiting\n"); if (PR_WaitCondVar(fullcv, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) { printf("Wait for full interrupted %d\n", PR_GetError()); done = PR_TRUE; --- 113,139 ---- SetSignal(0, flags); /* Make a copy of the data to be safe */ ! mynum = ip.num; ! memcpy(mydata, ip.data, sizeof(mydata)); Enable(); + #ifdef DEBUG_ARANDOM printf("Got %d pieces of random data\n", mynum); + fflush(stdout); + #endif PR_Lock(listLock); for (i = 0; i < mynum; i++) { int j; int d = mydata[i]; + int previous; for (j = 0; j < 4; j++) { while ((front - back % BUFFERSIZE) == BUFFERSIZE -1) { + #ifdef DEBUG_ARANDOM printf("Full, waiting\n"); + #endif if (PR_WaitCondVar(fullcv, PR_INTERVAL_NO_TIMEOUT) == PR_FAILURE) { + #ifdef DEBUG_ARANDOM printf("Wait for full interrupted %d\n", PR_GetError()); + #endif done = PR_TRUE; *************** *** 160,164 **** } } ! printf("SEtting databuffer %d to %d\n", front, (int)(d & 0xff)); randomdata[front] = d & 0xff; d >>= 8; --- 141,149 ---- } } ! #ifdef DEBUG_ARANDOM ! printf("Setting databuffer %d to %d\n", front, (int)(d & 0xff)); ! #endif ! d = d ^ previous; ! previous = d; randomdata[front] = d & 0xff; d >>= 8; *************** *** 179,185 **** WaitIO(io); CloseDevice(io); ! DeleteExtIO(io); DeleteMsgPort(mp); printf("random thread done \n"); } --- 164,172 ---- WaitIO(io); CloseDevice(io); ! DeleteIORequest(io); DeleteMsgPort(mp); + #ifdef DEBUG_ARANDOM printf("random thread done \n"); + #endif } *************** *** 195,208 **** --- 182,201 ---- eventThread->daemon = PR_TRUE; + #ifdef DEBUG_ARANDOM printf("Eventthread %lx, fullcv %lx, emptycv %lx\n", eventThread, fullcv, emptycv); + #endif } void _PR_CleanupRandom(void) { + #ifdef DEBUG_ARANDOM printf("Waiting for event thread\n"); + #endif PR_Interrupt(eventThread); _PR_MD_Signal(eventThread); PR_JoinThread(eventThread); + #ifdef DEBUG_ARANDOM printf("Done waiting for event thread\n"); + #endif PR_DestroyCondVar(emptycv); PR_DestroyCondVar(fullcv); *************** *** 216,223 **** --- 209,222 ---- PRSize _PR_MD_GetRandomNoise( void *buf, PRSize size ) { PRSize retval = size; + + #ifdef DEBUG_ARANDOM + printf("Getting %ld bytes of random noise\n"); + fflush(stdout); + #endif PR_Lock(listLock); while (size) { while ((front - back) % BUFFERSIZE == 0) { printf("Buffer empty, waiting...\n"); + fflush(stdout); PR_WaitCondVar(emptycv, PR_INTERVAL_NO_TIMEOUT); } |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:42:38
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29792 Modified Files: Makefile.in Log Message: Added special compilation rules for ainput.c Index: Makefile.in =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 7 Jul 2003 14:53:33 -0000 1.1 --- Makefile.in 11 Oct 2004 18:42:10 -0000 1.2 *************** *** 45,49 **** CSRCS += $(MDCSRCS) ! TARGETS = $(OBJS) INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private --- 45,49 ---- CSRCS += $(MDCSRCS) ! TARGETS = tinput $(OBJS) INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private *************** *** 55,56 **** --- 55,59 ---- export:: $(TARGETS) + # Need to compile tinput without restore-a4 + tinput: + $(MAKE) ainput.o DSO_CFLAGS="-m68020 -fbaserel32" |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:39:28
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28909 Modified Files: avar.c Log Message: Fixed debug define typo. Index: avar.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/avar.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** avar.c 4 Jul 2004 22:44:41 -0000 1.5 --- avar.c 11 Oct 2004 18:38:56 -0000 1.6 *************** *** 144,148 **** Permit(); ! #ifdef DEBUG_ASOCKET printf("%lx woke up from condvar sleep on %lx, flags are %lx\n", me, cvar, me->flags); #endif --- 144,148 ---- Permit(); ! #ifdef DEBUG_AVAR printf("%lx woke up from condvar sleep on %lx, flags are %lx\n", me, cvar, me->flags); #endif |
|
From: Jeff S. <jsh...@us...> - 2004-10-11 18:39:03
|
Update of /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28499 Modified Files: athreads.c Log Message: Libnix doesn't have environ so do use it. Set up the primordial thread pointer for each thread. Don't use amiga.lib functions anymore. _MD_Exit isn't static anymore. Index: athreads.c =================================================================== RCS file: /cvsroot/amizilla/amizilla/nsprpub/pr/src/md/amiga/athreads.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** athreads.c 18 Jul 2004 00:30:23 -0000 1.27 --- athreads.c 11 Oct 2004 18:38:29 -0000 1.28 *************** *** 36,46 **** #include <primpl.h> - extern char **environ; - /* DEBUG threads */ ! /* #define DEBUG_ATHREADS */ static PRStatus _InitThread(PRThread *pr); ! static void _MD_Exit(); static void killThread (PRThread *thread, PRBool kill) { --- 36,44 ---- #include <primpl.h> /* DEBUG threads */ ! /* #define DEBUG_ATHREADS*/ static PRStatus _InitThread(PRThread *pr); ! void _MD_Exit(); static void killThread (PRThread *thread, PRBool kill) { *************** *** 69,73 **** #ifdef DEBUG_ATHREADS ! printf("In processexit, next is %lx, prev is %lx\n", me->next, me->prev); #endif for (tmp = me->prev; tmp; tmp = tmp->prev) { --- 67,71 ---- #ifdef DEBUG_ATHREADS ! printf("In processexit %d, next is %lx, prev is %lx\n", kill, me->next, me->prev); #endif for (tmp = me->prev; tmp; tmp = tmp->prev) { *************** *** 90,96 **** --- 88,98 ---- void _MD_Early_Init(void) { PRThread *thread; + Printf("MD_Early_Init\n"); + Flush(Output()); thread = PR_NEWZAP(PRThread); primordialThread = thread; thread->p = (struct Process *)FindTask(NULL); + thread->primordialThread = thread->p; + thread->parent = NULL; thread->p->pr_Task.tc_UserData = thread; _InitThread(thread); *************** *** 98,109 **** #ifdef DEBUG_ATHREADS printf("Primorial Thread %lx\n", thread); #endif setvbuf(stdout, NULL, _IONBF, 0); atexit(_MD_Exit); - _PR_InitSocket(); _PR_InitRandom(); - } --- 100,110 ---- #ifdef DEBUG_ATHREADS printf("Primorial Thread %lx\n", thread); + fflush(stdout); #endif setvbuf(stdout, NULL, _IONBF, 0); atexit(_MD_Exit); _PR_InitSocket(); _PR_InitRandom(); } *************** *** 148,155 **** PR_ASSERT(pr->selectPort); pr->interruptSignal = AllocSignal(-1); PR_ASSERT(pr->interruptSignal != -1); pr->sleepRequest = ! (struct timerequest *)CreateExtIO(pr->port, sizeof(struct timerequest)); PR_ASSERT(pr->sleepRequest); --- 149,157 ---- PR_ASSERT(pr->selectPort); pr->interruptSignal = AllocSignal(-1); + pr->primordialThread = primordialThread->p; PR_ASSERT(pr->interruptSignal != -1); pr->sleepRequest = ! (struct timerequest *)CreateIORequest(pr->port, sizeof(struct timerequest)); PR_ASSERT(pr->sleepRequest); *************** *** 198,202 **** } CloseDevice((struct IORequest *)me->sleepRequest); ! DeleteExtIO((struct IORequest *)me->sleepRequest); if (me->AmiTCP_Base != NULL) CloseLibrary(me->AmiTCP_Base); --- 200,204 ---- } CloseDevice((struct IORequest *)me->sleepRequest); ! DeleteIORequest((struct IORequest *)me->sleepRequest); if (me->AmiTCP_Base != NULL) CloseLibrary(me->AmiTCP_Base); *************** *** 222,225 **** --- 224,231 ---- struct Library *ixemulbase; + #ifdef DEBUG_ATHREADS + printf("In procEntry\n"); + fflush(stdout); + #endif /* Hack. I need to wait for the parent to initialize some things for me */ Wait(SIGBREAKF_CTRL_F); *************** *** 301,305 **** --- 307,313 ---- thread->p->pr_Task.tc_TrapCode = me->p->pr_Task.tc_TrapCode; thread->p->pr_Task.tc_TrapData = me->p->pr_Task.tc_TrapData; + thread->parent = me; + thread->primordialThread = primordialThread->p; /* Add this thread to our list of threads */ *************** *** 329,333 **** #ifdef DEBUG_ATHREADS ! printf("CreateThread(%lx) created thread %lx\n", me, thread); #endif return thread; --- 337,342 ---- #ifdef DEBUG_ATHREADS ! printf("CreateThread(%lx) created thread %lx(%lx)\n", me, thread, thread->p); ! fflush(stdout); #endif return thread; *************** *** 406,412 **** PRThread *me = PR_CurrentThread(); _PR_THREAD_BLOCK_INTERRUPT(me); - #ifdef DEBUG_ATHREADS - printf("Blocking interrupt for %lx, flags are %lx\n", me, me->flags); - #endif } /* PR_BlockInterrupt */ --- 415,418 ---- *************** *** 415,421 **** PRThread *me = PR_CurrentThread(); _PR_THREAD_UNBLOCK_INTERRUPT(me); - #ifdef DEBUG_ATHREADS - printf("Unblocking interrupt for %lx, flags are %lx\n", me, me->flags); - #endif } /* PR_UnblockInterrupt */ --- 421,424 ---- *************** *** 432,436 **** } ! static void _MD_Exit(void) { if (_pr_initialized) { /* I need to kill the socket thread before killing off --- 435,439 ---- } ! void _MD_Exit(void) { if (_pr_initialized) { /* I need to kill the socket thread before killing off *************** *** 790,794 **** retval->md.argv = argv; ! retval->md.envp = envp != NULL ? envp : environ; retval->md.attr = attr; --- 793,797 ---- retval->md.argv = argv; ! retval->md.envp = envp != NULL ? envp : NULL; retval->md.attr = attr; *************** *** 848,853 **** } - void _MD_INIT_IO(void) { } - --- 851,854 ---- |