From 4ae7d3a8b0dd16f89cf76f91c8052308987f45e2 Mon Sep 17 00:00:00 2001 From: daney Date: Thu, 28 Oct 2004 15:22:44 +0000 Subject: [PATCH] 2004-10-28 David Daney * gnu/gcj/convert/Output_UnicodeLittleUnmarked.java: New file. * Makefile.am: Build it. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89763 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 6 ++++ libjava/Makefile.am | 1 + libjava/Makefile.in | 13 +++++-- .../gcj/convert/Output_UnicodeLittleUnmarked.java | 41 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0f2fe305636..103cc4bfec2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-10-28 David Daney + + * gnu/gcj/convert/Output_UnicodeLittleUnmarked.java: New file. + * Makefile.am: Build it. + * Makefile.in: Regenerate. + 2004-10-27 Aaron W. LaFramboise PR libgcj/18104 diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 9ffac50087b..e17bc95ed03 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -975,6 +975,7 @@ gnu/gcj/convert/Output_ASCII.java \ gnu/gcj/convert/Output_EUCJIS.java \ gnu/gcj/convert/Output_JavaSrc.java \ gnu/gcj/convert/Output_SJIS.java \ +gnu/gcj/convert/Output_UnicodeLittleUnmarked.java \ gnu/gcj/convert/Output_UTF8.java \ gnu/gcj/convert/Output_iconv.java \ gnu/gcj/convert/UnicodeToBytes.java diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 05819434252..80361d6bf2f 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1881,6 +1881,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc resolve.cc \ gnu/gcj/convert/Output_EUCJIS.java \ gnu/gcj/convert/Output_JavaSrc.java \ gnu/gcj/convert/Output_SJIS.java \ + gnu/gcj/convert/Output_UnicodeLittleUnmarked.java \ gnu/gcj/convert/Output_UTF8.java \ gnu/gcj/convert/Output_iconv.java \ gnu/gcj/convert/UnicodeToBytes.java \ @@ -3131,8 +3132,9 @@ am__objects_12 = gnu/gcj/convert/BytesToUnicode.lo \ gnu/gcj/convert/Output_ASCII.lo \ gnu/gcj/convert/Output_EUCJIS.lo \ gnu/gcj/convert/Output_JavaSrc.lo \ - gnu/gcj/convert/Output_SJIS.lo gnu/gcj/convert/Output_UTF8.lo \ - gnu/gcj/convert/Output_iconv.lo \ + gnu/gcj/convert/Output_SJIS.lo \ + gnu/gcj/convert/Output_UnicodeLittleUnmarked.lo \ + gnu/gcj/convert/Output_UTF8.lo gnu/gcj/convert/Output_iconv.lo \ gnu/gcj/convert/UnicodeToBytes.lo am__objects_13 = javax/accessibility/Accessible.lo \ javax/accessibility/AccessibleAction.lo \ @@ -4768,6 +4770,7 @@ gnu/gcj/convert/Output_ASCII.java \ gnu/gcj/convert/Output_EUCJIS.java \ gnu/gcj/convert/Output_JavaSrc.java \ gnu/gcj/convert/Output_SJIS.java \ +gnu/gcj/convert/Output_UnicodeLittleUnmarked.java \ gnu/gcj/convert/Output_UTF8.java \ gnu/gcj/convert/Output_iconv.java \ gnu/gcj/convert/UnicodeToBytes.java @@ -12731,6 +12734,9 @@ gnu/gcj/convert/Output_JavaSrc.lo: gnu/gcj/convert/$(am__dirstamp) \ gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp) gnu/gcj/convert/Output_SJIS.lo: gnu/gcj/convert/$(am__dirstamp) \ gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp) +gnu/gcj/convert/Output_UnicodeLittleUnmarked.lo: \ + gnu/gcj/convert/$(am__dirstamp) \ + gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp) gnu/gcj/convert/Output_UTF8.lo: gnu/gcj/convert/$(am__dirstamp) \ gnu/gcj/convert/$(DEPDIR)/$(am__dirstamp) gnu/gcj/convert/Output_iconv.lo: gnu/gcj/convert/$(am__dirstamp) \ @@ -14131,6 +14137,8 @@ mostlyclean-compile: -rm -f gnu/gcj/convert/Output_SJIS.lo -rm -f gnu/gcj/convert/Output_UTF8.$(OBJEXT) -rm -f gnu/gcj/convert/Output_UTF8.lo + -rm -f gnu/gcj/convert/Output_UnicodeLittleUnmarked.$(OBJEXT) + -rm -f gnu/gcj/convert/Output_UnicodeLittleUnmarked.lo -rm -f gnu/gcj/convert/Output_iconv.$(OBJEXT) -rm -f gnu/gcj/convert/Output_iconv.lo -rm -f gnu/gcj/convert/UnicodeToBytes.$(OBJEXT) @@ -19043,6 +19051,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Output_JavaSrc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Output_SJIS.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Output_UTF8.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Output_UnicodeLittleUnmarked.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Output_iconv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/UnicodeToBytes.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/Unicode_to_JIS.Plo@am__quote@ diff --git a/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java new file mode 100644 index 00000000000..a6b6336a216 --- /dev/null +++ b/libjava/gnu/gcj/convert/Output_UnicodeLittleUnmarked.java @@ -0,0 +1,41 @@ +/* Copyright (C) 2004 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package gnu.gcj.convert; + +/** + * Convert to Unicode Little Endian, no marker + */ +public class Output_UnicodeLittleUnmarked extends UnicodeToBytes +{ + public String getName() { return "UnicodeLittleUnmarked"; } + + /** Convert chars to bytes. + * Converted bytes are written to buf, starting at count. + * @param inbuffer source of characters to convert + * @param inpos index of initial character in inbuffer to convert + * @param inlength number of characters to convert + * @return number of chars converted + * Also, this.count is increment by the number of bytes converted. + */ + public int write (char[] inbuffer, int inpos, int inlength) + { + int avail = buf.length - count; + if (inlength * 2 > avail) + inlength = avail / 2; + for (int i = inlength; i > 0; i--) + { + char c = inbuffer[inpos++]; + buf[count] = (byte)c; + buf[count+1] = (byte)(c >> 8); + count += 2; + } + return inlength; + } +} + -- 2.11.4.GIT