X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/75b0a45730c047dc8bf77060f4fade2488e073fa..c8a2a786eb3f1cda8780b348f27e2c8240621045:/Console.cpp?ds=sidebyside diff --git a/Console.cpp b/Console.cpp index b3702ca..57f4375 100644 --- a/Console.cpp +++ b/Console.cpp @@ -1,70 +1,75 @@ -/* Cycript - Remove Execution Server and Disassembler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . +**/ /* }}} */ -#define _GNU_SOURCE - -#include #include "cycript.hpp" +#ifdef CY_EXECUTE +#include "JavaScript.hpp" +#endif + #include +#include #include #include +#ifdef HAVE_READLINE_H +#include +#else #include -#include +#endif -#include +#ifdef HAVE_HISTORY_H +#include +#else +#include +#endif #include +#include +#include #include +#include #include #include #include - -#include "Cycript.tab.hh" +#include #include #include #include #include +#include + +#include + +#ifdef __APPLE__ +#include +#endif + +#include "Display.hpp" +#include "Driver.hpp" +#include "Highlight.hpp" +#include "Parser.hpp" static volatile enum { Working, @@ -83,7 +88,8 @@ static void sigint(int) { case Parsing: longjmp(ctrlc_, 1); case Running: - throw "*** Ctrl-C"; + CYCancel(); + return; case Sending: return; case Waiting: @@ -91,71 +97,200 @@ static void sigint(int) { } } -void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expand = false) { - CYPool pool; +static bool bison_; +static bool timing_; +static bool strict_; +static bool pretty_; + +void Setup(CYDriver &driver) { + if (bison_) + driver.debug_ = 1; + if (strict_) + driver.strict_ = true; +} +void Setup(CYOutput &out, CYDriver &driver, CYOptions &options, bool lower) { + out.pretty_ = pretty_; + if (lower) + driver.Replace(options); +} + +static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) { const char *json; - if (socket == -1) { + uint32_t size; + + if (client == -1) { mode_ = Running; - json = CYExecute(pool, data); +#ifdef CY_EXECUTE + json = CYExecute(CYGetJSContext(), pool, code); +#else + json = NULL; +#endif mode_ = Working; - if (json != NULL) + if (json == NULL) + size = 0; + else size = strlen(json); } else { mode_ = Sending; - CYSendAll(socket, &size, sizeof(size)); - CYSendAll(socket, data, size); + size = code.size; + _assert(CYSendAll(client, &size, sizeof(size))); + _assert(CYSendAll(client, code.data, code.size)); mode_ = Waiting; - CYRecvAll(socket, &size, sizeof(size)); - if (size == _not(size_t)) + _assert(CYRecvAll(client, &size, sizeof(size))); + if (size == _not(uint32_t)) json = NULL; else { char *temp(new(pool) char[size + 1]); - CYRecvAll(socket, temp, size); + _assert(CYRecvAll(client, temp, size)); temp[size] = '\0'; json = temp; } mode_ = Working; } - if (json != NULL && fout != NULL) { - if (!expand || json[0] != '"' && json[0] != '\'') - fputs(json, fout); - else for (size_t i(0); i != size; ++i) - if (json[i] != '\\') - fputc(json[i], fout); - else switch(json[++i]) { - case '\0': goto done; - case '\\': fputc('\\', fout); break; - case '\'': fputc('\'', fout); break; - case '"': fputc('"', fout); break; - case 'b': fputc('\b', fout); break; - case 'f': fputc('\f', fout); break; - case 'n': fputc('\n', fout); break; - case 'r': fputc('\r', fout); break; - case 't': fputc('\t', fout); break; - case 'v': fputc('\v', fout); break; - default: fputc('\\', fout); --i; break; - } + return CYUTF8String(json, size); +} - done: - fputs("\n", fout); - fflush(fout); - } +static CYUTF8String Run(CYPool &pool, int client, const std::string &code) { + return Run(pool, client, CYUTF8String(code.c_str(), code.size())); +} + +static std::ostream *out_; + +static void Write(bool syntax, const char *data, size_t size, std::ostream &out) { + if (syntax) + CYLexerHighlight(data, size, out); + else + out.write(data, size); +} + +static void Output(bool syntax, CYUTF8String json, std::ostream *out, bool expand = false) { + const char *data(json.data); + size_t size(json.size); + + if (data == NULL || out == NULL) + return; + + if (!expand || + data[0] != '@' && data[0] != '"' && data[0] != '\'' || + data[0] == '@' && data[1] != '"' && data[1] != '\'' + ) + Write(syntax, data, size, *out); + else for (size_t i(0); i != size; ++i) + if (data[i] != '\\') + *out << data[i]; + else switch(data[++i]) { + case '\0': goto done; + case '\\': *out << '\\'; break; + case '\'': *out << '\''; break; + case '"': *out << '"'; break; + case 'b': *out << '\b'; break; + case 'f': *out << '\f'; break; + case 'n': *out << '\n'; break; + case 'r': *out << '\r'; break; + case 't': *out << '\t'; break; + case 'v': *out << '\v'; break; + default: *out << '\\'; --i; break; + } + + done: + *out << std::endl; +} + +static void Run(int client, bool syntax, const char *data, size_t size, std::ostream *out = NULL, bool expand = false) { + CYPool pool; + Output(syntax, Run(pool, client, CYUTF8String(data, size)), out, expand); +} + +static void Run(int client, bool syntax, std::string &code, std::ostream *out = NULL, bool expand = false) { + Run(client, syntax, code.c_str(), code.size(), out, expand); +} + +int (*append_history$)(int, const char *); + +static std::string command_; + +static int client_; + +static CYUTF8String Run(CYPool &pool, const std::string &code) { + return Run(pool, client_, code); } -void Run(int socket, std::string &code, FILE *fout = NULL, bool expand = false) { - Run(socket, code.c_str(), code.size(), fout, expand); +static char **Complete(const char *word, int start, int end) { + rl_attempted_completion_over = ~0; + std::string line(rl_line_buffer, start); + return CYComplete(word, command_ + line, &Run); } -static void Console(int socket) { +// need char *, not const char * +static char name_[] = "cycript"; +static char break_[] = " \t\n\"\\'`@><=;|&{(" ")}" ".:[]"; + +class History { + private: + std::string histfile_; + size_t histlines_; + + public: + History(std::string histfile) : + histfile_(histfile), + histlines_(0) + { + read_history(histfile_.c_str()); + } + + ~History() { + if (append_history$ != NULL) { + int fd(_syscall(open(histfile_.c_str(), O_CREAT | O_WRONLY, 0600))); + _syscall(close(fd)); + _assert((*append_history$)(histlines_, histfile_.c_str()) == 0); + } else { + _assert(write_history(histfile_.c_str()) == 0); + } + } + + void operator +=(const std::string &command) { + add_history(command.c_str()); + ++histlines_; + } +}; + +static void Console(CYOptions &options) { + std::string basedir; + if (const char *home = getenv("HOME")) + basedir = home; + else { + passwd *passwd; + if (const char *username = getenv("LOGNAME")) + passwd = getpwnam(username); + else + passwd = getpwuid(getuid()); + basedir = passwd->pw_dir; + } + + basedir += "/.cycript"; + mkdir(basedir.c_str(), 0700); + + rl_initialize(); + rl_readline_name = name_; + + History history(basedir + "/history"); + bool bypass(false); bool debug(false); bool expand(false); + bool lower(true); + bool syntax(true); - FILE *fout(stdout); + out_ = &std::cout; - rl_bind_key('\t', rl_insert); + // rl_completer_word_break_characters is broken in libedit + rl_basic_word_break_characters = break_; + + rl_completer_word_break_characters = break_; + rl_attempted_completion_function = &Complete; + rl_bind_key('\t', rl_complete); struct sigaction action; sigemptyset(&action.sa_mask); @@ -164,7 +299,7 @@ static void Console(int socket) { sigaction(SIGINT, &action, NULL); restart: for (;;) { - std::string command; + command_.clear(); std::vector lines; bool extra(false); @@ -172,17 +307,28 @@ static void Console(int socket) { if (setjmp(ctrlc_) != 0) { mode_ = Working; - fputs("\n", fout); - fflush(fout); + *out_ << std::endl; goto restart; } read: + +#if RL_READLINE_VERSION >= 0x0600 + if (syntax) + rl_redisplay_function = CYDisplayUpdate; + else + rl_redisplay_function = rl_redisplay; +#endif + mode_ = Parsing; char *line(readline(prompt)); mode_ = Working; - if (line == NULL) + + if (line == NULL) { + *out_ << std::endl; break; + } else if (line[0] == '\0') + goto read; if (!extra) { extra = true; @@ -190,52 +336,74 @@ static void Console(int socket) { std::string data(line + 1); if (data == "bypass") { bypass = !bypass; - fprintf(fout, "bypass == %s\n", bypass ? "true" : "false"); - fflush(fout); + *out_ << "bypass == " << (bypass ? "true" : "false") << std::endl; } else if (data == "debug") { debug = !debug; - fprintf(fout, "debug == %s\n", debug ? "true" : "false"); - fflush(fout); + *out_ << "debug == " << (debug ? "true" : "false") << std::endl; + } else if (data == "destroy") { + CYDestroyContext(); + } else if (data == "gc") { + *out_ << "collecting... " << std::flush; + CYGarbageCollect(CYGetJSContext()); + *out_ << "done." << std::endl; + } else if (data == "exit") { + return; } else if (data == "expand") { expand = !expand; - fprintf(fout, "expand == %s\n", expand ? "true" : "false"); - fflush(fout); + *out_ << "expand == " << (expand ? "true" : "false") << std::endl; + } else if (data == "lower") { + lower = !lower; + *out_ << "lower == " << (lower ? "true" : "false") << std::endl; + } else if (data == "syntax") { + syntax = !syntax; + *out_ << "syntax == " << (syntax ? "true" : "false") << std::endl; } - add_history(line); + command_ = line; + history += command_; goto restart; } } - command += line; - for (char *state, *token(apr_strtok(line, "\n", &state)); token != NULL; token = apr_strtok(NULL, "\n", &state)) - lines.push_back(token); + command_ += line; + command_ += "\n"; + + char *begin(line), *end(line + strlen(line)); + while (char *nl = reinterpret_cast(memchr(begin, '\n', end - begin))) { + *nl = '\0'; + lines.push_back(begin); + begin = nl + 1; + } + + lines.push_back(begin); + free(line); std::string code; if (bypass) - code = command; + code = command_; else { - CYDriver driver(""); - cy::parser parser(driver); - //parser.set_debug_level(1); + std::istringstream stream(command_); + + CYPool pool; + CYDriver driver(pool, stream); + Setup(driver); - driver.data_ = command.c_str(); - driver.size_ = command.size(); + bool failed(driver.Parse()); - if (parser.parse() != 0 || !driver.errors_.empty()) { + if (failed || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator error(driver.errors_.begin()); error != driver.errors_.end(); ++error) { - cy::position begin(error->location_.begin); - if (begin.line != lines.size() || begin.column - 1 != lines.back().size()) { - cy::position end(error->location_.end); + CYPosition begin(error->location_.begin); + if (begin.line != lines.size() + 1 || error->warning_) { + CYPosition end(error->location_.end); if (begin.line != lines.size()) { std::cerr << " | "; std::cerr << lines[begin.line - 1] << std::endl; } - std::cerr << " | "; - for (size_t i(0); i != begin.column - 1; ++i) + std::cerr << "...."; + for (size_t i(0); i != begin.column; ++i) std::cerr << '.'; if (begin.line != end.line || begin.column == end.column) std::cerr << '^'; @@ -246,175 +414,422 @@ static void Console(int socket) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - add_history(command.c_str()); + history += command_.substr(0, command_.size() - 1); goto restart; } } driver.errors_.clear(); - command += '\n'; prompt = "cy> "; goto read; } - if (driver.source_ == NULL) + if (driver.script_ == NULL) goto restart; - if (socket != -1) - code = command; - else { - std::ostringstream str; - driver.source_->Show(str); - code = str.str(); - } + std::stringbuf str; + CYOutput out(str, options); + Setup(out, driver, options, lower); + out << *driver.script_; + code = str.str(); } - add_history(command.c_str()); + history += command_.substr(0, command_.size() - 1); - if (debug) - std::cout << code << std::endl; + if (debug) { + std::cout << "cy= "; + Write(syntax, code.c_str(), code.size(), std::cout); + std::cout << std::endl; + } - Run(socket, code, fout, expand); + Run(client_, syntax, code, out_, expand); } - - fputs("\n", fout); - fflush(fout); } -static void *Map(const char *path, size_t *psize) { - int fd; - _syscall(fd = open(path, O_RDONLY)); - - struct stat stat; - _syscall(fstat(fd, &stat)); - size_t size(stat.st_size); - - *psize = size; +void InjectLibrary(pid_t, int, const char *const []); - void *base; - _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); - - _syscall(close(fd)); - return base; +static uint64_t CYGetTime() { +#ifdef __APPLE__ + return mach_absolute_time(); +#else + struct timespec spec; + clock_gettime(CLOCK_MONOTONIC, &spec); + return spec.tv_sec * UINT64_C(1000000000) + spec.tv_nsec; +#endif } -int main(int argc, char *argv[]) { +int Main(int argc, char * const argv[], char const * const envp[]) { bool tty(isatty(STDIN_FILENO)); - pid_t pid(_not(pid_t)); bool compile(false); + bool target(false); + CYOptions options; - for (;;) switch (getopt(argc, argv, "cp:")) { - case -1: - goto getopt; - case '?': - fprintf(stderr, "usage: cycript [-c] [-p ] [