Merge change 5749
* changes:
init now returns proper error codes in dmesg for write command (init.rc)
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 1a14842..ad4bd74 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -62,6 +62,7 @@
#define AID_NET_BT 3002 /* bluetooth: create sco, rfcomm or l2cap sockets */
#define AID_INET 3003 /* can create AF_INET and AF_INET6 sockets */
#define AID_NET_RAW 3004 /* can create raw INET sockets */
+#define AID_NET_ADMIN 3005 /* can configure interfaces and routing tables. */
#define AID_MISC 9998 /* access to misc storage */
#define AID_NOBODY 9999
@@ -101,6 +102,7 @@
{ "keystore", AID_KEYSTORE, },
{ "inet", AID_INET, },
{ "net_raw", AID_NET_RAW, },
+ { "net_admin", AID_NET_ADMIN, },
{ "misc", AID_MISC, },
{ "nobody", AID_NOBODY, },
};
@@ -135,7 +137,7 @@
{ 00750, AID_ROOT, AID_SHELL, "sbin" },
{ 00755, AID_ROOT, AID_SHELL, "system/bin" },
{ 00755, AID_ROOT, AID_SHELL, "system/xbin" },
- { 00777, AID_ROOT, AID_ROOT, "system/etc/ppp" }, /* REMOVE */
+ { 00755, AID_ROOT, AID_ROOT, "system/etc/ppp" },
{ 00777, AID_ROOT, AID_ROOT, "sdcard" },
{ 00755, AID_ROOT, AID_ROOT, 0 },
};
@@ -147,20 +149,18 @@
** and will allow partial matches.
*/
static struct fs_path_config android_files[] = {
- { 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/ip-up" },
- { 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/ip-down" },
{ 00440, AID_ROOT, AID_SHELL, "system/etc/init.goldfish.rc" },
{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.goldfish.sh" },
{ 00440, AID_ROOT, AID_SHELL, "system/etc/init.trout.rc" },
{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.ril" },
{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.testmenu" },
- { 00550, AID_ROOT, AID_SHELL, "system/etc/init.gprs-pppd" },
{ 00550, AID_DHCP, AID_SHELL, "system/etc/dhcpcd/dhcpcd-run-hooks" },
{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/dbus.conf" },
{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/main.conf" },
{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/input.conf" },
{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluez/audio.conf" },
- { 00440, AID_RADIO, AID_AUDIO, "/system/etc/AudioPara4.csv" },
+ { 00440, AID_RADIO, AID_AUDIO, "system/etc/AudioPara4.csv" },
+ { 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/*" },
{ 00644, AID_SYSTEM, AID_SYSTEM, "data/app/*" },
{ 00644, AID_SYSTEM, AID_SYSTEM, "data/app-private/*" },
{ 00644, AID_APP, AID_APP, "data/data/*" },
diff --git a/init/devices.c b/init/devices.c
index 9b341d6..e76d354 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -140,7 +140,8 @@
{ "/dev/qmi2", 0640, AID_RADIO, AID_RADIO, 0 },
/* CDMA radio interface MUX */
{ "/dev/ts0710mux", 0640, AID_RADIO, AID_RADIO, 1 },
- { "/dev/tun", 0640, AID_VPN , AID_VPN, 0 },
+ { "/dev/ppp", 0660, AID_RADIO, AID_VPN, 0 },
+ { "/dev/tun", 0640, AID_VPN, AID_VPN, 0 },
{ NULL, 0, 0, 0, 0 },
};
diff --git a/init/property_service.c b/init/property_service.c
index 48ca3ea..23a8821 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -67,6 +67,8 @@
{ "wlan.", AID_SYSTEM },
{ "dhcp.", AID_SYSTEM },
{ "dhcp.", AID_DHCP },
+ { "vpn.", AID_SYSTEM },
+ { "vpn.", AID_VPN },
{ "debug.", AID_SHELL },
{ "log.", AID_SHELL },
{ "service.adb.root", AID_SHELL },
diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index fdddf22..83fc2fe 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -1266,6 +1266,281 @@
#endif // PROVIDE_TRACE_CODEGEN
+
+ // Subset of STL vector.
+ template<class E> class Vector {
+ public:
+ Vector() {
+ mpBase = 0;
+ mUsed = 0;
+ mSize = 0;
+ }
+
+ ~Vector() {
+ if (mpBase) {
+ for(size_t i = 0; i < mUsed; i++) {
+ mpBase[mUsed].~E();
+ }
+ free(mpBase);
+ }
+ }
+
+ inline E& operator[](size_t i) {
+ return mpBase[i];
+ }
+
+ inline E& front() {
+ return mpBase[0];
+ }
+
+ inline E& back() {
+ return mpBase[mUsed - 1];
+ }
+
+ void pop_back() {
+ mUsed -= 1;
+ mpBase[mUsed].~E();
+ }
+
+ void push_back(const E& item) {
+ * ensure(1) = item;
+ }
+
+ size_t size() {
+ return mUsed;
+ }
+
+ private:
+ E* ensure(int n) {
+ size_t newUsed = mUsed + n;
+ if (newUsed > mSize) {
+ size_t newSize = mSize * 2 + 10;
+ if (newSize < newUsed) {
+ newSize = newUsed;
+ }
+ mpBase = (E*) realloc(mpBase, sizeof(E) * newSize);
+ mSize = newSize;
+ }
+ E* result = mpBase + mUsed;
+ mUsed = newUsed;
+ return result;
+ }
+
+ E* mpBase;
+ size_t mUsed;
+ size_t mSize;
+ };
+
+ class Arena {
+ public:
+ // Used to record a given allocation amount.
+ // Used:
+ // Mark mark = arena.mark();
+ // ... lots of arena.allocate()
+ // arena.free(mark);
+
+ struct Mark {
+ size_t chunk;
+ size_t offset;
+ };
+
+ Arena() {
+ mCurrentChunk = 0;
+ Chunk start(CHUNK_SIZE);
+ mData.push_back(start);
+ }
+
+ ~Arena() {
+ for(size_t i = 0; i < mData.size(); i++) {
+ mData[i].free();
+ }
+ }
+
+ // Alloc using the standard alignment size safe for any variable
+ void* alloc(size_t size) {
+ return alloc(size, 8);
+ }
+
+ Mark mark(){
+ Mark result;
+ result.chunk = mCurrentChunk;
+ result.offset = mData[mCurrentChunk].mOffset;
+ return result;
+ }
+
+ void freeToMark(const Mark& mark) {
+ mCurrentChunk = mark.chunk;
+ mData[mCurrentChunk].mOffset = mark.offset;
+ }
+
+ private:
+ // Allocate memory aligned to a given size
+ // and a given power-of-two-sized alignment (e.g. 1,2,4,8,...)
+ // Memory is not zero filled.
+
+ void* alloc(size_t size, size_t alignment) {
+ while (size > mData[mCurrentChunk].remainingCapacity(alignment)) {
+ if (mCurrentChunk + 1 < mData.size()) {
+ mCurrentChunk++;
+ } else {
+ size_t allocSize = CHUNK_SIZE;
+ if (allocSize < size + alignment - 1) {
+ allocSize = size + alignment - 1;
+ }
+ Chunk chunk(allocSize);
+ mData.push_back(chunk);
+ mCurrentChunk++;
+ }
+ }
+ return mData[mCurrentChunk].allocate(size, alignment);
+ }
+
+ static const size_t CHUNK_SIZE = 128*1024;
+ // Note: this class does not deallocate its
+ // memory when it's destroyed. It depends upon
+ // its parent to deallocate the memory.
+ struct Chunk {
+ Chunk() {
+ mpData = 0;
+ mSize = 0;
+ mOffset = 0;
+ }
+
+ Chunk(size_t size) {
+ mSize = size;
+ mpData = (char*) malloc(size);
+ mOffset = 0;
+ }
+
+ ~Chunk() {
+ // Doesn't deallocate memory.
+ }
+
+ void* allocate(size_t size, size_t alignment) {
+ size_t alignedOffset = aligned(mOffset, alignment);
+ void* result = mpData + alignedOffset;
+ mOffset = alignedOffset + size;
+ return result;
+ }
+
+ void free() {
+ if (mpData) {
+ ::free(mpData);
+ mpData = 0;
+ }
+ }
+
+ size_t remainingCapacity(size_t alignment) {
+ return aligned(mSize, alignment) - aligned(mOffset, alignment);
+ }
+
+ // Assume alignment is a power of two
+ inline size_t aligned(size_t v, size_t alignment) {
+ size_t mask = alignment-1;
+ return (v + mask) & ~mask;
+ }
+
+ char* mpData;
+ size_t mSize;
+ size_t mOffset;
+ };
+
+ size_t mCurrentChunk;
+
+ Vector<Chunk> mData;
+ };
+
+ typedef int tokenid_t;
+ struct VariableInfo;
+
+ struct Token {
+ int hash;
+ size_t length;
+ char* pText;
+ tokenid_t id;
+
+ // Current values for the token
+ char* mpMacroDefinition;
+ VariableInfo* mpVariableInfo;
+ };
+
+ class TokenTable {
+ public:
+ // Don't use 0..0xff, allows characters and operators to be tokens too.
+
+ static const int TOKEN_BASE = 0x100;
+ TokenTable() {
+ mpMap = hashmapCreate(128, hashFn, equalsFn);
+ }
+
+ ~TokenTable() {
+ hashmapFree(mpMap);
+ }
+
+ void setArena(Arena* pArena) {
+ mpArena = pArena;
+ }
+
+ // Returns a token for a given string of characters.
+ tokenid_t intern(const char* pText, size_t length) {
+ Token probe;
+ int hash = hashmapHash((void*) pText, length);
+ {
+ Token probe;
+ probe.hash = hash;
+ probe.length = length;
+ probe.pText = (char*) pText;
+ Token* pValue = (Token*) hashmapGet(mpMap, &probe);
+ if (pValue) {
+ // printf("intern - found existing %s for %d\n",
+ // pValue->pText, pValue->id);
+ return pValue->id;
+ }
+ }
+
+ Token* pToken = (Token*) mpArena->alloc(sizeof(Token));
+ memset(pToken, 0, sizeof(*pToken));
+ pToken->hash = hash;
+ pToken->length = length;
+ pToken->pText = (char*) mpArena->alloc(length + 1);
+ memcpy(pToken->pText, pText, length);
+ pToken->pText[length] = 0;
+ pToken->id = mTokens.size() + TOKEN_BASE;
+ mTokens.push_back(pToken);
+ hashmapPut(mpMap, pToken, pToken);
+ // printf("intern - new token %s %d\n", pToken->pText, pToken->id);
+ return pToken->id;
+ }
+
+ // Return the Token for a given tokenid.
+ Token& operator[](tokenid_t id) {
+ return *mTokens[id - TOKEN_BASE];
+ }
+
+ inline size_t size() {
+ return mTokens.size();
+ }
+
+ private:
+
+ static int hashFn(void* pKey) {
+ Token* pToken = (Token*) pKey;
+ return pToken->hash;
+ }
+
+ static bool equalsFn(void* keyA, void* keyB) {
+ Token* pTokenA = (Token*) keyA;
+ Token* pTokenB = (Token*) keyB;
+ // Don't need to compare hash values, they should always be equal
+ return pTokenA->length == pTokenB->length
+ && strcmp(pTokenA->pText, pTokenB->pText) == 0;
+ }
+
+ Hashmap* mpMap;
+ Vector<Token*> mTokens;
+ Arena* mpArena;
+ };
+
class InputStream {
public:
int getChar() {
@@ -1430,266 +1705,54 @@
size_t mSize;
};
- /**
- * Wrap an externally allocated string for use as a hash key.
- */
- class FakeString : public String {
- public:
- FakeString(const char* string, size_t length) :
- String((char*) string, length, true) {}
+ void internKeywords() {
+ // Note: order has to match TOK_ constants
+ static const char* keywords[] = {
+ "int",
+ "char",
+ "void",
+ "if",
+ "else",
+ "while",
+ "break",
+ "return",
+ "for",
+ "pragma",
+ "define",
+ "auto",
+ "case",
+ "const",
+ "continue",
+ "default",
+ "do",
+ "double",
+ "enum",
+ "extern",
+ "float",
+ "goto",
+ "long",
+ "register",
+ "short",
+ "signed",
+ "sizeof",
+ "static",
+ "struct",
+ "switch",
+ "typedef",
+ "union",
+ "unsigned",
+ "volatile",
+ "_Bool",
+ "_Complex",
+ "_Imaginary",
+ "inline",
+ "restrict",
+ 0};
- ~FakeString() {
- orphan();
+ for(int i = 0; keywords[i]; i++) {
+ mTokenTable.intern(keywords[i], strlen(keywords[i]));
}
- };
-
- template<class V> class StringTable {
- public:
- StringTable() {
- init(10);
- }
-
- StringTable(size_t initialCapacity) {
- init(initialCapacity);
- }
-
- ~StringTable() {
- clear();
- hashmapFree(mpMap);
- }
-
- void clear() {
- hashmapForEach(mpMap, freeKeyValue, this);
- }
-
- bool contains(String* pKey) {
- bool result = hashmapContainsKey(mpMap, pKey);
- return result;
- }
-
- V* get(String* pKey) {
- V* result = (V*) hashmapGet(mpMap, pKey);
- return result;
- }
-
- V* remove(String* pKey) {
- V* result = (V*) hashmapRemove(mpMap, pKey);
- return result;
- }
-
- V* put(String* pKey, V* value) {
- V* result = (V*) hashmapPut(mpMap, pKey, value);
- if (result) {
- // The key was not adopted by the map, so delete it here.
- delete pKey;
- }
- return result;
- }
-
- void forEach(bool (*callback)(String* key, V* value, void* context),
- void* context) {
- hashmapForEach(mpMap, (bool (*)(void*, void*, void*)) callback,
- context);
- }
-
- protected:
-
- void init(size_t initialCapacity) {
- mpMap = hashmapCreate(initialCapacity, hashFn, equalsFn);
- }
-
- static int hashFn(void* pKey) {
- String* pString = (String*) pKey;
- return hashmapHash(pString->getUnwrapped(), pString->len());
- }
-
- static bool equalsFn(void* keyA, void* keyB) {
- String* pStringA = (String*) keyA;
- String* pStringB = (String*) keyB;
- return pStringA->len() == pStringB->len()
- && strcmp(pStringA->getUnwrapped(), pStringB->getUnwrapped())
- == 0;
- }
-
- static bool freeKeyValue(void* key, void* value, void* context) {
- delete (String*) key;
- delete (V*) value;
- return true;
- }
-
- Hashmap* mpMap;
- };
-
- class MacroTable : public StringTable<String> {
- public:
- MacroTable() : StringTable<String>(10) {}
- };
-
- class KeywordTable {
- public:
-
- KeywordTable(){
- mpMap = hashmapCreate(40, hashFn, equalsFn);
- put("int", TOK_INT);
- put("char", TOK_CHAR);
- put("void", TOK_VOID);
- put("if", TOK_IF);
- put("else", TOK_ELSE);
- put("while", TOK_WHILE);
- put("break", TOK_BREAK);
- put("return", TOK_RETURN);
- put("for", TOK_FOR);
- // TODO: remove these preprocessor-specific keywords. You should
- // be able to have symbols named pragma or define.
- put("pragma", TOK_PRAGMA);
- put("define", TOK_DEFINE);
-
- const char* unsupported[] = {
- "auto",
- "case",
- "const",
- "continue",
- "default",
- "do",
- "double",
- "enum",
- "extern",
- "float",
- "goto",
- "long",
- "register",
- "short",
- "signed",
- "sizeof",
- "static",
- "struct",
- "switch",
- "typedef",
- "union",
- "unsigned",
- "volatile",
- "_Bool",
- "_Complex",
- "_Imaginary",
- "inline",
- "restrict",
- 0};
-
- for(int i = 0; unsupported[i]; i++) {
- put(unsupported[i], TOK_UNSUPPORTED_KEYWORD);
- }
- }
-
- ~KeywordTable() {
- hashmapFree(mpMap);
- }
-
- int get(String* key) {
- return (int) hashmapGet(mpMap, key->getUnwrapped());
- }
-
- const char* lookupKeyFor(int value) {
- FindValContext context;
- context.key = 0;
- hashmapForEach(mpMap, findKeyFn, &context);
- return context.key;
- }
-
- private:
- void put(const char* kw, int val) {
- hashmapPut(mpMap, (void*) kw, (void*) val);
- }
-
- static int hashFn(void* pKey) {
- char* pString = (char*) pKey;
- return hashmapHash(pString, strlen(pString));
- }
-
- static bool equalsFn(void* keyA, void* keyB) {
- const char* pStringA = (const char*) keyA;
- const char* pStringB = (const char*) keyB;
- return strcmp(pStringA, pStringB) == 0;
- }
-
- struct FindValContext {
- char* key;
- int value;
- };
-
- static bool findKeyFn(void* key, void* value, void* context) {
- FindValContext* pContext = (FindValContext*) context;
- if ((int) value == pContext->value) {
- pContext->key = (char*) key;
- return false;
- }
- return true;
- }
-
- Hashmap* mpMap;
- };
-
- template<class E> class Array {
- public:
- Array() {
- mpBase = 0;
- mUsed = 0;
- mSize = 0;
- }
-
- ~Array() {
- if (mpBase) {
- free(mpBase);
- }
- }
-
- E get(int i) {
- if (i < 0 || i > (int) mUsed) {
- // error("internal error: Index out of range");
- return E();
- }
- return mpBase[i];
- }
-
- void set(int i, E val) {
- mpBase[i] = val;
- }
-
- void pop() {
- if (mUsed > 0) {
- mUsed -= 1;
- } else {
- // error("internal error: Popped empty stack.");
- }
- }
-
- void push(E item) {
- * ensure(1) = item;
- }
-
- size_t len() {
- return mUsed;
- }
-
- private:
- E* ensure(int n) {
- size_t newUsed = mUsed + n;
- if (newUsed > mSize) {
- size_t newSize = mSize * 2 + 10;
- if (newSize < newUsed) {
- newSize = newUsed;
- }
- mpBase = (E*) realloc(mpBase, sizeof(E) * newSize);
- mSize = newSize;
- }
- E* result = mpBase + mUsed;
- mUsed = newUsed;
- return result;
- }
-
- E* mpBase;
- size_t mUsed;
- size_t mSize;
- };
+ }
struct InputState {
InputStream* pStream;
@@ -1697,114 +1760,92 @@
};
struct VariableInfo {
- VariableInfo() {
- pAddress = 0;
- pForward = 0;
- }
void* pAddress;
void* pForward; // For a forward direction, linked list of data to fix up
+ tokenid_t tok;
+ size_t level;
+ VariableInfo* pOldDefinition;
};
- typedef StringTable<VariableInfo> SymbolTable;
-
class SymbolStack {
public:
SymbolStack() {
- mLevel = 0;
- addEntry();
+ mpArena = 0;
+ mpTokenTable = 0;
+ }
+
+ void setArena(Arena* pArena) {
+ mpArena = pArena;
+ }
+
+ void setTokenTable(TokenTable* pTokenTable) {
+ mpTokenTable = pTokenTable;
}
void pushLevel() {
- mLevel++;
+ Mark mark;
+ mark.mArenaMark = mpArena->mark();
+ mark.mSymbolHead = mStack.size();
+ mLevelStack.push_back(mark);
}
void popLevel() {
- mLevel--;
- Entry e = mStack.get(mStack.len()-1);
- if (mLevel < e.level) {
- mStack.pop();
- delete e.pTable;
+ // Undo any shadowing that was done:
+ Mark mark = mLevelStack.back();
+ mLevelStack.pop_back();
+ while (mStack.size() > mark.mSymbolHead) {
+ VariableInfo* pV = mStack.back();
+ mStack.pop_back();
+ (*mpTokenTable)[pV->tok].mpVariableInfo = pV->pOldDefinition;
}
+ mpArena->freeToMark(mark.mArenaMark);
}
- VariableInfo* get(String* pName) {
- int len = mStack.len();
- VariableInfo* v = NULL;
- int level = -1;
- for (int i = len - 1; i >= 0; i--) {
- Entry e = mStack.get(i);
- v = e.pTable->get(pName);
- if (v) {
- level = e.level;
+ bool isDefinedAtCurrentLevel(tokenid_t tok) {
+ VariableInfo* pV = (*mpTokenTable)[tok].mpVariableInfo;
+ return pV && pV->level == level();
+ }
+
+ VariableInfo* add(tokenid_t tok) {
+ Token& token = (*mpTokenTable)[tok];
+ VariableInfo* pOldV = token.mpVariableInfo;
+ VariableInfo* pNewV =
+ (VariableInfo*) mpArena->alloc(sizeof(VariableInfo));
+ memset(pNewV, 0, sizeof(VariableInfo));
+ pNewV->tok = tok;
+ pNewV->level = level();
+ pNewV->pOldDefinition = pOldV;
+ token.mpVariableInfo = pNewV;
+ mStack.push_back(pNewV);
+ return pNewV;
+ }
+
+ void forEach(bool (*fn)(VariableInfo*, void*), void* context) {
+ for (size_t i = 0; i < mStack.size(); i++) {
+ if (! fn(mStack[i], context)) {
break;
}
}
-#if 0
- fprintf(stderr, "Lookup %s %08x level %d\n", pName->getUnwrapped(), v, level);
- if (v) {
- fprintf(stderr, " %08x %08x\n", v->pAddress, v->pForward);
- }
-#endif
- return v;
- }
-
- VariableInfo* addLocal(String* pName) {
- int len = mStack.len();
- if (mStack.get(len-1).level != mLevel) {
- addEntry();
- len++;
- }
- return addImp(len-1, pName);
- }
-
- VariableInfo* addGlobal(String* pName) {
- return addImp(0, pName);
- }
-
- void forEachGlobal(
- bool (*callback)(String* key, VariableInfo* value, void* context),
- void* context) {
- mStack.get(0).pTable->forEach(callback, context);
}
private:
- VariableInfo* addImp(int entryIndex, String* pName) {
- Entry e = mStack.get(entryIndex);
- SymbolTable* pTable = e.pTable;
- if (pTable->contains(pName)) {
- return NULL;
- }
- VariableInfo* v = new VariableInfo();
-
- delete pTable->put(pName, v);
-#if 0
- fprintf(stderr, "Add \"%s\" %08x level %d\n", pName->getUnwrapped(), v, e.level);
-#endif
- return v;
+ inline size_t level() {
+ return mLevelStack.size();
}
- void addEntry() {
- Entry e;
- e.level = mLevel;
- e.pTable = new SymbolTable();
- mStack.push(e);
- }
-
- struct Entry {
- Entry() {
- level = 0;
- pTable = NULL;
- }
- int level;
- SymbolTable* pTable;
+ struct Mark {
+ Arena::Mark mArenaMark;
+ size_t mSymbolHead;
};
- int mLevel;
- Array<Entry> mStack;
+ Arena* mpArena;
+ TokenTable* mpTokenTable;
+ Vector<VariableInfo*> mStack;
+ Vector<Mark> mLevelStack;
};
int ch; // Current input character, or EOF
- intptr_t tok; // token
+ tokenid_t tok; // token
intptr_t tokc; // token extra info
int tokl; // token operator level
intptr_t rsym; // return symbol
@@ -1814,16 +1855,21 @@
char* dptr; // Macro state: Points to macro text during macro playback.
int dch; // Macro state: Saves old value of ch during a macro playback.
char* pGlobalBase;
- KeywordTable mKeywords;
- SymbolStack mSymbolTable;
+
+ // Arena for the duration of the compile
+ Arena mGlobalArena;
+ // Arena for data that's only needed when compiling a single function
+ Arena mLocalArena;
+
+ TokenTable mTokenTable;
+ SymbolStack mGlobals;
+ SymbolStack mLocals;
+
InputStream* file;
CodeBuf codeBuf;
CodeGenerator* pGen;
- MacroTable mMacros;
- Array<InputState> mInputStateStack;
-
String mErrorBuf;
String mPragmas;
@@ -1837,25 +1883,51 @@
// 3..255 are character and/or operators
// Keywords start at 0x100 and increase by 1
- static const int TOK_KEYWORD = 0x100;
- static const int TOK_INT = TOK_KEYWORD + 0;
- static const int TOK_CHAR = TOK_KEYWORD + 1;
- static const int TOK_VOID = TOK_KEYWORD + 2;
- static const int TOK_IF = TOK_KEYWORD + 3;
- static const int TOK_ELSE = TOK_KEYWORD + 4;
- static const int TOK_WHILE = TOK_KEYWORD + 5;
- static const int TOK_BREAK = TOK_KEYWORD + 6;
- static const int TOK_RETURN = TOK_KEYWORD + 7;
- static const int TOK_FOR = TOK_KEYWORD + 8;
- static const int TOK_PRAGMA = TOK_KEYWORD + 9;
- static const int TOK_DEFINE = TOK_KEYWORD + 10;
- static const int TOK_UNSUPPORTED_KEYWORD = TOK_KEYWORD + 0xff;
-
- static const int TOK_UNDEFINED_SYMBOL = 0x200;
-
- // Symbols start at 0x300, but are really pointers to VariableInfo structs.
- static const int TOK_SYMBOL = 0x300;
-
+ // Order has to match string list in "internKeywords".
+ enum {
+ TOK_KEYWORD = TokenTable::TOKEN_BASE,
+ TOK_INT = TOK_KEYWORD,
+ TOK_CHAR,
+ TOK_VOID,
+ TOK_IF,
+ TOK_ELSE,
+ TOK_WHILE,
+ TOK_BREAK,
+ TOK_RETURN,
+ TOK_FOR,
+ TOK_PRAGMA,
+ TOK_DEFINE,
+ TOK_AUTO,
+ TOK_CASE,
+ TOK_CONST,
+ TOK_CONTINUE,
+ TOK_DEFAULT,
+ TOK_DO,
+ TOK_DOUBLE,
+ TOK_ENUM,
+ TOK_EXTERN,
+ TOK_FLOAT,
+ TOK_GOTO,
+ TOK_LONG,
+ TOK_REGISTER,
+ TOK_SHORT,
+ TOK_SIGNED,
+ TOK_SIZEOF,
+ TOK_STATIC,
+ TOK_STRUCT,
+ TOK_SWITCH,
+ TOK_TYPEDEF,
+ TOK_UNION,
+ TOK_UNSIGNED,
+ TOK_VOLATILE,
+ TOK__BOOL,
+ TOK__COMPLEX,
+ TOK__IMAGINARY,
+ TOK_INLINE,
+ TOK_RESTRICT,
+ // Symbols start after tokens
+ TOK_SYMBOL
+ };
static const int LOCAL = 0x200;
@@ -1896,6 +1968,33 @@
static const char* operatorChars;
static const char operatorLevel[];
+ /* Called when we detect an internal problem. Does nothing in production.
+ *
+ */
+ void internalError() {
+ * (char*) 0 = 0;
+ }
+
+ VariableInfo* VI(tokenid_t t) {
+ if ( t < TOK_SYMBOL || t-TOK_SYMBOL >= mTokenTable.size()) {
+ internalError();
+ }
+ // printf("Looking up %s %d\n", nameof(t), t);
+ VariableInfo* pV = mTokenTable[t].mpVariableInfo;
+ if (pV && pV->tok != t) {
+ internalError();
+ }
+ return pV;
+ }
+
+ inline bool isDefined(tokenid_t t) {
+ return t >= TOK_SYMBOL && VI(t) != 0;
+ }
+
+ inline const char* nameof(tokenid_t t) {
+ return mTokenTable[t].pText;
+ }
+
void pdef(int t) {
mTokenString.append(t);
}
@@ -2037,27 +2136,16 @@
tokc = strtol(mTokenString.getUnwrapped(), 0, 0);
tok = TOK_NUM;
} else {
+ tok = mTokenTable.intern(mTokenString.getUnwrapped(),
+ mTokenString.len());
// Is this a macro?
- String* pValue = mMacros.get(&mTokenString);
- if (pValue) {
+ char* pMacroDefinition = mTokenTable[tok].mpMacroDefinition;
+ if(pMacroDefinition) {
// Yes, it is a macro
- dptr = pValue->getUnwrapped();
+ dptr = pMacroDefinition;
dch = ch;
inp();
next();
- } else {
- // Is this a keyword?
- int kwtok = mKeywords.get(&mTokenString);
- if (kwtok) {
- tok = kwtok;
- // fprintf(stderr, "tok= keyword %s %x\n", last_id, tok);
- } else {
- tok = (intptr_t) mSymbolTable.get(&mTokenString);
- if (!tok) {
- tok = TOK_UNDEFINED_SYMBOL;
- }
- // fprintf(stderr, "tok= symbol %s %x\n", last_id, tok);
- }
}
}
} else {
@@ -2119,40 +2207,19 @@
}
#if 0
{
- const char* p;
-
- printf("tok=0x%x ", tok);
- if (tok >= TOK_KEYWORD) {
- printf("'");
- if (tok>= TOK_SYMBOL)
- p = sym_stk + 1 + ((char*) tok - (char*) pVarsBase) / 8;
- else {
- p = mKeywords.lookupKeyFor(tok);
- if (!p) {
- p = "unknown keyword";
- }
- }
- while (*p != TAG_TOK && *p)
- printf("%c", *p++);
- printf("'\n");
- } else if (tok == TOK_NUM) {
- printf("%d\n", tokc);
- } else {
- printf("'%c'\n", tok);
- }
- }
+ String buf;
+ decodeToken(buf, tok);
+ printf("%s\n", buf.getUnwrapped()); }
#endif
}
void doDefine() {
+ next();
+ tokenid_t name = tok;
String* pName = new String();
while (isspace(ch)) {
inp();
}
- while (isid()) {
- pName->append(ch);
- inp();
- }
if (ch == '(') {
delete pName;
error("Defines with arguments not supported");
@@ -2161,12 +2228,15 @@
while (isspace(ch)) {
inp();
}
- String* pValue = new String();
+ String value;
while (ch != '\n' && ch != EOF) {
- pValue->append(ch);
+ value.append(ch);
inp();
}
- delete mMacros.put(pName, pValue);
+ char* pDefn = (char*)mGlobalArena.alloc(value.len() + 1);
+ memcpy(pDefn, value.getUnwrapped(), value.len());
+ pDefn[value.len()] = 0;
+ mTokenTable[name].mpMacroDefinition = pDefn;
}
void doPragma() {
@@ -2291,7 +2361,7 @@
pGen->loadR0FromR0(t == TOK_INT);
}
} else if (t == '&') {
- pGen->leaR0(*(int *) tok);
+ pGen->leaR0((int) VI(tok)->pAddress);
next();
} else if (t == EOF ) {
error("Unexpected EOF.");
@@ -2299,17 +2369,17 @@
// Don't have to do anything special here, the error
// message was printed by checkSymbol() above.
} else {
- if (t == TOK_UNDEFINED_SYMBOL) {
- t = (intptr_t) mSymbolTable.addGlobal(
- new String(tString));
+ if (!isDefined(t)) {
+ mGlobals.add(t);
+ // printf("Adding new global function %s\n", nameof(t));
}
- n = (intptr_t) ((VariableInfo*) t)->pAddress;
+ n = (intptr_t) VI(t)->pAddress;
/* forward reference: try dlsym */
if (!n) {
n = (intptr_t) dlsym(RTLD_DEFAULT,
tString.getUnwrapped());
- ((VariableInfo*) t)->pAddress = (void*) n;
+ VI(t)->pAddress = (void*) n;
}
if ((tok == '=') & l) {
/* assignment */
@@ -2349,8 +2419,8 @@
skip(')');
if (!n) {
/* forward reference */
- t = t + 4;
- *(int *) t = pGen->callForward(*(int *) t);
+ VariableInfo* pVI = VI(t);
+ pVI->pForward = (void*) pGen->callForward((int) pVI->pForward);
} else if (n == 1) {
pGen->callIndirect(l);
} else {
@@ -2459,14 +2529,14 @@
pGen->gsym(a);
} else if (tok == '{') {
if (! outermostFunctionBlock) {
- mSymbolTable.pushLevel();
+ mLocals.pushLevel();
}
next();
while (tok != '}' && tok != EOF)
block(l, false);
skip('}');
if (! outermostFunctionBlock) {
- mSymbolTable.popLevel();
+ mLocals.popLevel();
}
} else {
if (tok == TOK_RETURN) {
@@ -2537,26 +2607,29 @@
void expectType(Type& t) {
if (!acceptType(t)) {
- error("Expected a type.");
+ String buf;
+ decodeToken(buf, tok);
+ error("Expected a type, got %s", buf.getUnwrapped());
}
}
void addGlobalSymbol() {
- tok = (intptr_t) mSymbolTable.addGlobal(
- new String(mTokenString));
- reportIfDuplicate();
+ VariableInfo* pVI = VI(tok);
+ if(pVI && pVI->pAddress) {
+ reportDuplicate();
+ }
+ mGlobals.add(tok);
}
- void reportIfDuplicate() {
- if (!tok) {
- error("Duplicate definition of %s", mTokenString.getUnwrapped());
- }
+ void reportDuplicate() {
+ error("Duplicate definition of %s", nameof(tok));
}
void addLocalSymbol() {
- tok = (intptr_t) mSymbolTable.addLocal(
- new String(mTokenString));
- reportIfDuplicate();
+ if (mLocals.isDefinedAtCurrentLevel(tok)) {
+ reportDuplicate();
+ }
+ mLocals.add(tok);
}
void localDeclarations() {
@@ -2572,7 +2645,7 @@
if (tok) {
loc = loc + 4;
variableAddress = -loc;
- ((VariableInfo*) tok)->pAddress = (void*) variableAddress;
+ VI(tok)->pAddress = (void*) variableAddress;
}
}
next();
@@ -2593,22 +2666,25 @@
return checkSymbol(tok, &mTokenString);
}
- bool checkSymbol(int token, String* pText) {
- bool result = token < EOF || token >= TOK_UNDEFINED_SYMBOL;
+ void decodeToken(String& buffer, tokenid_t token) {
+ if (token == EOF ) {
+ buffer.printf("EOF");
+ } else if (token == TOK_NUM) {
+ buffer.printf("numeric constant");
+ } else if (token >= 0 && token < 256) {
+ buffer.printf("char \'%c\'", token);
+ } else if (token >= TOK_KEYWORD && token < TOK_SYMBOL) {
+ buffer.printf("keyword \"%s\"", nameof(token));
+ } else {
+ buffer.printf("symbol \"%s\"", nameof(token));
+ }
+ }
+
+ bool checkSymbol(tokenid_t token, String* pText) {
+ bool result = token >= TOK_SYMBOL;
if (!result) {
String temp;
- if (token == EOF ) {
- temp.printf("EOF");
- } else if (token == TOK_NUM) {
- temp.printf("numeric constant");
- } else if (token >= 0 && token < 256) {
- temp.printf("char \'%c\'", token);
- } else if (token >= TOK_KEYWORD && token < TOK_UNSUPPORTED_KEYWORD) {
- temp.printf("keyword \"%s\"", pText->getUnwrapped());
- } else {
- temp.printf("reserved keyword \"%s\"",
- pText->getUnwrapped());
- }
+ decodeToken(temp, token);
error("Expected symbol. Got %s", temp.getUnwrapped());
}
return result;
@@ -2619,14 +2695,14 @@
Type base;
expectType(base);
Type t = acceptPointerDeclaration(t);
- if (tok >= 0 && tok < TOK_UNDEFINED_SYMBOL) {
+ if (tok < TOK_SYMBOL) {
error("Unexpected token %d", tok);
break;
}
- if (tok == TOK_UNDEFINED_SYMBOL) {
+ if (! isDefined(tok)) {
addGlobalSymbol();
}
- VariableInfo* name = (VariableInfo*) tok;
+ VariableInfo* name = VI(tok);
if (name && name->pAddress) {
error("Already defined global %s",
mTokenString.getUnwrapped());
@@ -2655,7 +2731,7 @@
skip(',');
t = acceptPointerDeclaration(t);
addGlobalSymbol();
- name = (VariableInfo*) tok;
+ name = VI(tok);
next();
}
skip(';');
@@ -2668,7 +2744,7 @@
name->pAddress = (void*) codeBuf.getPC();
}
skip('(');
- mSymbolTable.pushLevel();
+ mLocals.pushLevel();
intptr_t a = 8;
int argCount = 0;
while (tok != ')' && tok != EOF) {
@@ -2679,7 +2755,7 @@
addLocalSymbol();
if (tok) {
/* read param name and compute offset */
- *(int *) tok = a;
+ VI(tok)->pAddress = (void*) a;
a = a + 4;
}
}
@@ -2694,7 +2770,7 @@
block(0, true);
pGen->gsym(rsym);
pGen->functionExit(argCount, a, loc);
- mSymbolTable.popLevel();
+ mLocals.popLevel();
}
}
}
@@ -2795,6 +2871,13 @@
cleanup();
clear();
+ mTokenTable.setArena(&mGlobalArena);
+ mGlobals.setArena(&mGlobalArena);
+ mGlobals.setTokenTable(&mTokenTable);
+ mLocals.setArena(&mLocalArena);
+ mLocals.setTokenTable(&mTokenTable);
+
+ internKeywords();
codeBuf.init(ALLOC_SIZE);
setArchitecture(NULL);
if (!pGen) {
@@ -2822,22 +2905,18 @@
}
void checkForUndefinedForwardReferences() {
- mSymbolTable.forEachGlobal(static_ufrcFn, this);
+ mGlobals.forEach(static_ufrcFn, this);
}
- static bool static_ufrcFn(String* key, VariableInfo* value,
- void* context) {
+ static bool static_ufrcFn(VariableInfo* value, void* context) {
Compiler* pCompiler = (Compiler*) context;
- return pCompiler->undefinedForwardReferenceCheck(key, value);
+ return pCompiler->undefinedForwardReferenceCheck(value);
}
- bool undefinedForwardReferenceCheck(String* key, VariableInfo* value) {
-#if 0
- fprintf(stderr, "%s 0x%8x 0x%08x\n", key->getUnwrapped(),
- value->pAddress, value->pForward);
-#endif
+ bool undefinedForwardReferenceCheck(VariableInfo* value) {
if (!value->pAddress && value->pForward) {
- error("Undefined forward reference: %s", key->getUnwrapped());
+ error("Undefined forward reference: %s",
+ mTokenTable[value->tok].pText);
}
return true;
}
@@ -2855,8 +2934,8 @@
* If found, return its value.
*/
void* lookup(const char* name) {
- String string(name, -1, false);
- VariableInfo* pVariableInfo = mSymbolTable.get(&string);
+ tokenid_t tok = mTokenTable.intern(name, strlen(name));
+ VariableInfo* pVariableInfo = VI(tok);
if (pVariableInfo) {
return pVariableInfo->pAddress;
}
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 44e343c..e66b1c3 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -6,16 +6,9 @@
copy_from := \
etc/dbus.conf \
etc/init.goldfish.sh \
- etc/ppp/ip-up \
- etc/ppp/ip-down \
- etc/ppp/peers/common \
- etc/racoon/racoon.conf \
+ etc/ppp/ip-up-vpn \
etc/hosts
-dont_copy := \
- etc/init.gprs-pppd \
- etc/ppp/chap-secrets
-
copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from))
diff --git a/rootdir/etc/init.gprs-pppd b/rootdir/etc/init.gprs-pppd
deleted file mode 100755
index 521eec9..0000000
--- a/rootdir/etc/init.gprs-pppd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/system/bin/sh
-# An unforunate wrapper script
-# so that the exit code of pppd may be retrieved
-
-
-# this is a workaround for issue #651747
-#trap "/system/bin/sleep 1;exit 0" TERM
-
-
-PPPD_PID=
-
-/system/bin/setprop "net.gprs.ppp-exit" ""
-
-/system/bin/log -t pppd "Starting pppd"
-
-/system/bin/pppd $*
-
-PPPD_EXIT=$?
-PPPD_PID=$!
-
-/system/bin/log -t pppd "pppd exited with $PPPD_EXIT"
-
-/system/bin/setprop "net.gprs.ppp-exit" "$PPPD_EXIT"
diff --git a/rootdir/etc/ppp/chap-secrets b/rootdir/etc/ppp/chap-secrets
deleted file mode 100644
index 6546b0f..0000000
--- a/rootdir/etc/ppp/chap-secrets
+++ /dev/null
@@ -1,2 +0,0 @@
-* * bogus
-
diff --git a/rootdir/etc/ppp/ip-down b/rootdir/etc/ppp/ip-down
deleted file mode 100755
index 58d21e5..0000000
--- a/rootdir/etc/ppp/ip-down
+++ /dev/null
@@ -1 +0,0 @@
-#!/system/bin/sh
diff --git a/rootdir/etc/ppp/ip-up b/rootdir/etc/ppp/ip-up
deleted file mode 100755
index 8c8f12c..0000000
--- a/rootdir/etc/ppp/ip-up
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/system/bin/sh
-
-# Use interface name if linkname is not available
-
-/system/bin/setprop "net.dns1" "$DNS1"
-/system/bin/setprop "net.dns2" "$DNS2"
-
-# Retrieve the default gateway from /proc/net/route
-RTAB=`cat /proc/net/route`
-flag=-1; i=0;
-for l in $RTAB; do
- if (exp flag==1) then DGW=$l; flag=0; fi;
- if (exp i%11 == 1) then
- if (exp $l=="00000000") then flag=1; fi;
- fi;
- i=`exp i+1`;
-done
-FH=${DGW%????}
-LH=${DGW#????}
-A=`exp 0x${LH#??}`
-B=`exp 0x${LH%??}`
-C=`exp 0x${FH#??}`
-D=`exp 0x${FH%??}`
-GATEWAY="$A.$B.$C.$D"
-VPNSERVER=`getprop "net.vpn.server_ip"`
-
-# Protect the route to vpn server
-/system/bin/route add -net $VPNSERVER netmask 255.255.255.255 gw $GATEWAY
-
-# Route all traffic to vpn connection
-/system/bin/route add -net 0.0.0.0 netmask 128.0.0.0 gw $IPREMOTE
-/system/bin/route add -net 128.0.0.0 netmask 128.0.0.0 gw $IPREMOTE
-
diff --git a/rootdir/etc/ppp/peers/common b/rootdir/etc/ppp/peers/common
deleted file mode 100755
index 4183841..0000000
--- a/rootdir/etc/ppp/peers/common
+++ /dev/null
@@ -1,10 +0,0 @@
-ipcp-accept-local
-ipcp-accept-remote
-refuse-eap
-noccp
-noauth
-idle 1800
-mtu 1400
-mru 1400
-nodefaultroute
-usepeerdns
diff --git a/rootdir/etc/racoon/racoon.conf b/rootdir/etc/racoon/racoon.conf
deleted file mode 100644
index eb50a2d..0000000
--- a/rootdir/etc/racoon/racoon.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#path certificate "";
-path certificate "/";
-
-sainfo anonymous {
- encryption_algorithm aes, 3des;
- authentication_algorithm hmac_sha1, hmac_md5;
- compression_algorithm deflate;
- lifetime time 3600 sec;
-}
-
-remote anonymous {
- exchange_mode main;
- doi ipsec_doi;
- situation identity_only;
- ike_frag on;
- generate_policy on;
- my_identifier asn1dn;
- nat_traversal on; # always use NAT-T
- ca_type x509 "ca.crt";
- certificate_type x509 "user.crt" "user.key";
- verify_identifier off;
- verify_cert on;
- nonce_size 16;
- initial_contact on;
- proposal_check obey;
-
- proposal {
- authentication_method rsasig;
- hash_algorithm sha1;
- encryption_algorithm 3des;
- lifetime time 3600 sec;
- dh_group 2;
- }
-}
-
diff --git a/vold/format.c b/vold/format.c
index a1faf7a..d4e2327 100755
--- a/vold/format.c
+++ b/vold/format.c
@@ -39,12 +39,13 @@
if (!strcmp(type, FORMAT_TYPE_FAT32)) {
char *args[6];
args[0] = MKDOSFS_PATH;
- args[1] = "-c 32";
- args[2] = "-n 2";
- args[3] = "-O android";
- args[4] = devpath;
- args[5] = NULL;
- rc = logwrap(5, args, 1);
+ args[1] = "-F 32";
+ args[2] = "-c 32";
+ args[3] = "-n 2";
+ args[4] = "-O android";
+ args[5] = devpath;
+ args[6] = NULL;
+ rc = logwrap(6, args, 1);
} else {
char *args[7];
args[0] = MKE2FS_PATH;