Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9ba230a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am d66aa916: Merge changes Ife2dd406,I1ac481a2 into honeycomb 

* commit 'd66aa916':
  Assembly coded android_memset16 and android_memset32
  init: Fix parser line numbering
parents 48b911c5 d66aa916

init/init_parser.c

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void parse_config(const char *fn, char *s) 


    nargs = 0;

    state.filename = fn;

    state.line = 1;

    state.line = 0;

    state.ptr = s;

    state.nexttoken = 0;

    state.parse_line = parse_line_no_op;
@@ -198,6 +198,7 @@ static void parse_config(const char *fn, char *s) 
            state.parse_line(&state, 0, 0);

            return;

        case T_NEWLINE:

            state.line++;

            if (nargs) {

                int kw = lookup_keyword(args[0]);

                if (kw_is(kw, SECTION)) {

init/parser.c

+7 −4
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ int next_token(struct parse_state *state) 
            state->ptr = x;

            return T_EOF;

        case '\n':

            state->line++;

            x++;

            state->ptr = x;

            return T_NEWLINE;
@@ -94,9 +93,13 @@ int next_token(struct parse_state *state) 
            continue;

        case '#':

            while (*x && (*x != '\n')) x++;

            state->line++;

            state->ptr = x;

            if (*x == '\n') {

                state->ptr = x+1;

                return T_NEWLINE;

            } else {

                state->ptr = x;

                return T_EOF;

            }

        default:

            goto text;

        }

libcutils/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -112,12 +112,17 @@ LOCAL_MODULE := libcutils 
LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c



ifeq ($(TARGET_ARCH),arm)

LOCAL_SRC_FILES += memset32.S

LOCAL_SRC_FILES += arch-arm/memset32.S

else  # !arm

ifeq ($(TARGET_ARCH),sh)

LOCAL_SRC_FILES += memory.c atomic-android-sh.c

else  # !sh

ifeq ($(TARGET_ARCH_VARIANT),x86-atom)

LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32

LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c

else # !x86-atom

LOCAL_SRC_FILES += memory.c

endif # !x86-atom

endif # !sh

endif # !arm

libcutils/memset32.S→libcutils/arch-arm/memset32.S

+0 −0

File moved.

View file

libcutils/arch-x86/android_memset16.S

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

/*

 * Contributed by: Intel Corporation

 */



#if defined(USE_SSE2)



# include "cache_wrapper.S"

# undef __i686

# define USE_AS_ANDROID

# define sse2_memset16_atom android_memset16

# include "sse2-memset16-atom.S"



#else



# include "memset16.S"



#endif