Instruction
stringlengths
14
778
input_code
stringlengths
0
4.24k
output_code
stringlengths
1
5.44k
Fix broken xrefs that use the doc-guides attribute
// Allow examples to render correctly in previews despite being // a nested directory :idprefix: :idseparator: - :icons: font :doc-guides: ../ :doc-examples: ../_examples :imagesdir: ../../asciidoc/images :includes: ../includes :root: ../../asciidoc/
// Allow examples to render correctly in previews despite being // a nested directory :idprefix: :idseparator: - :icons: font :doc-guides: .. :doc-examples: ../_examples :imagesdir: ../../asciidoc/images :includes: ../includes :root: ../../asciidoc/
Add the Efene plugin to the list
[[plugins_list]] == List of plugins This is a non-exhaustive list of Erlang.mk plugins, sorted alphabetically. === elixir.mk An https://github.com/botsunit/elixir.mk[Elixir plugin] for Erlang.mk. http://elixir-lang.org/[Elixir] is an alternative language for the BEAM. === elvis.mk An https://github.com/inaka/elvis.mk[Elvis plugin] for Erlang.mk. Elvis is an https://github.com/inaka/elvis[Erlang style reviewer]. === geas https://github.com/crownedgrouse/geas[Geas] gives aggregated information on a project and its dependencies, and is available as an Erlang.mk plugin. === hexer.mk An https://github.com/inaka/hexer.mk[Hex plugin] for Erlang.mk. Hex is a https://hex.pm/[package manager for the Elixir ecosystem]. === lfe.mk An https://github.com/ninenines/lfe.mk[LFE plugin] for Erlang.mk. LFE, or http://lfe.io/[Lisp Flavoured Erlang], is an alternative language for the BEAM. === reload.mk A https://github.com/bullno1/reload.mk[live reload plugin] for Erlang.mk.
[[plugins_list]] == List of plugins This is a non-exhaustive list of Erlang.mk plugins, sorted alphabetically. === efene.mk An https://github.com/ninenines/efene.mk[Efene plugin] for Erlang.mk. http://efene.org/[Efene] is an alternative language for the BEAM. === elixir.mk An https://github.com/botsunit/elixir.mk[Elixir plugin] for Erlang.mk. http://elixir-lang.org/[Elixir] is an alternative language for the BEAM. === elvis.mk An https://github.com/inaka/elvis.mk[Elvis plugin] for Erlang.mk. Elvis is an https://github.com/inaka/elvis[Erlang style reviewer]. === geas https://github.com/crownedgrouse/geas[Geas] gives aggregated information on a project and its dependencies, and is available as an Erlang.mk plugin. === hexer.mk An https://github.com/inaka/hexer.mk[Hex plugin] for Erlang.mk. Hex is a https://hex.pm/[package manager for the Elixir ecosystem]. === lfe.mk An https://github.com/ninenines/lfe.mk[LFE plugin] for Erlang.mk. LFE, or http://lfe.io/[Lisp Flavoured Erlang], is an alternative language for the BEAM. === reload.mk A https://github.com/bullno1/reload.mk[live reload plugin] for Erlang.mk.
Simplify command to change managementState
// Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring-registry-storage/configuring-registry-storage-baremetal.adoc // * registry/configuring-registry-storage/configuring-registry-storage-vsphere.adoc [id="registry-change-management-state_{context}"] = Change image registry ManagementState To start the image registry, you must change `ManagementState` Image Registry Operator configuration from `Removed` to `Managed`. .Procedure * Change `ManagementState` Image Registry Operator configuration from `Removed` to `Managed`. For example: + [source,yaml] ---- apiVersion: imageregistry.operator.openshift.io/v1 kind: Config metadata: creationTimestamp: <time> finalizers: - imageregistry.operator.openshift.io/finalizer generation: 3 name: cluster resourceVersion: <version> selfLink: <link> spec: readOnly: false disableRedirect: false requests: read: maxInQueue: 0 maxRunning: 0 maxWaitInQueue: 0s write: maxInQueue: 0 maxRunning: 0 maxWaitInQueue: 0s defaultRoute: true managementState: Managed ----
// Module included in the following assemblies: // // * installing/installing_bare_metal/installing-bare-metal.adoc // * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc // * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * installing/installing_vsphere/installing-vsphere.adoc // * registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc // * registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc // * virt/virtual_machines/importing_vms/virt-importing-vmware-vm.adoc [id="registry-change-management-state_{context}"] = Changing the image registry's management state To start the image registry, you must change the Image Registry Operator configuration's `managementState` from `Removed` to `Managed`. .Procedure * Change `managementState` Image Registry Operator configuration from `Removed` to `Managed`. For example: + [source,terminal] ---- $ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"managementState":"Managed"}}' ----
Add documentation on building uberjars
= Packed deployments We use the term 'packed deployment' to mean that everything required at runtime is built (if necessary) and packed into an archive, ready for deployment and execution in the target operating environment. It is common to create 'uberjars' containing pre-compiled Clojure code, togther with dependent pre-compiled library code from Clojure and other JVM languages. Advantages of this approach include: * Start up time is fast, ideal for AWS Lambdas and for coping with sudden spikes in traffic, for example, using AWS auto-scaling groups. * Immutable Disadvantages include: * Uberjars can be large, meaning they _can_ be costly to build, store and transfer across network links. * Lossy uberjar build process, possible licensing issues and ambiguities. * Require a full redeploy on every change * Distance between dev and prod NOTE: Coming soon, documentation about integration with `pack`.
= Packed deployments We use the term 'packed deployment' to mean that everything required at runtime is built (if necessary) and packed into an archive, ready for deployment and execution in the target operating environment. It is common to create 'uberjars' containing pre-compiled Clojure code, togther with dependent pre-compiled library code from Clojure and other JVM languages. Advantages of this approach include: * Start up time is fast, ideal for AWS Lambdas and for coping with sudden spikes in traffic, for example, using AWS auto-scaling groups. * Immutable Disadvantages include: * Uberjars can be large, meaning they _can_ be costly to build, store and transfer across network links. * Lossy uberjar build process, possible licensing issues and ambiguities. * Require a full redeploy on every change * Distance between dev and prod == Creating an uberjar From the top-level directory, run the following: [source] ---- edge$ bin/uberjar main ---- This creates an uberjar named `main.jar`. NOTE: By default, uberjars are built using the https://github.com/juxt/pack.alpha#capsule[*capsule* strategy] in JUXT's https://github.com/juxt/pack.alpha[pack] tool. == Running the uberjar [source] ---- edge$ java -jar main.jar ----
Add note about supported Spring Boot plugin version
== Spring Boot Application Plugin The plugin `com.bmuschko.docker-spring-boot-application` is a highly opinionated plugin for projects applying the https://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-gradle-plugin.html[Spring Boot plugin]. Under the covers the plugin preconfigures tasks for creating and pushing Docker images for your Spring Boot application. The default configuration is tweakable via an exposed extension. The plugin https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/html/#reacting-to-other-plugins[reacts] to either the `java` or `war` plugin. include::31-usage.adoc[] include::32-extension.adoc[] include::33-tasks.adoc[] include::34-examples.adoc[]
== Spring Boot Application Plugin The plugin `com.bmuschko.docker-spring-boot-application` is a highly opinionated plugin for projects applying the https://docs.spring.io/spring-boot/docs/current/reference/html/build-tool-plugins-gradle-plugin.html[Spring Boot plugin]. Under the covers the plugin preconfigures tasks for creating and pushing Docker images for your Spring Boot application. The default configuration is tweakable via an exposed extension. The plugin https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/html/#reacting-to-other-plugins[reacts] to either the `java` or `war` plugin. [IMPORTANT] The plugin only supports projects that use a 2.x version of the Spring Boot plugin. include::31-usage.adoc[] include::32-extension.adoc[] include::33-tasks.adoc[] include::34-examples.adoc[]
Document package migration in release notes
=== 5.0.0-M1 *Date of Release:* June 30, 2016 *Scope:* First milestone release of JUnit 5 ==== Summary of Changes ===== JUnit Platform - `org.junit.platform.console.ConsoleRunner` has been renamed to `ConsoleLauncher` ===== JUnit Jupiter - `ExtensionContext.getElement()` now returns `Optional<AnnotatedElement>`. ===== JUnit Vintage - ???
=== 5.0.0-M1 *Date of Release:* June 30, 2016 *Scope:* First milestone release of JUnit 5 ==== Summary of Changes The following is a list of global changes. For details regarding changes specific to the Platform, Jupiter, and Vintage, consult the dedicated subsections. .Package Migration [cols="20,80"] |=== | Old Base Package | New Base Package | `org.junit.gen5.api` | `org.junit.jupiter.api` | `org.junit.gen5.commons` | `org.junit.platform.commons` | `org.junit.gen5.console` | `org.junit.platform.console` | `org.junit.gen5.engine.junit4` | `org.junit.vintage.engine` | `org.junit.gen5.engine.junit5` | `org.junit.jupiter.engine` | `org.junit.gen5.engine` | `org.junit.platform.engine` | `org.junit.gen5.gradle` | `org.junit.platform.gradle.plugin` | `org.junit.gen5.junit4.runner` | `org.junit.platform.runner` | `org.junit.gen5.launcher` | `org.junit.platform.launcher` | `org.junit.gen5.surefire` | `org.junit.platform.surefire.provider` |=== ===== JUnit Platform - `org.junit.platform.console.ConsoleRunner` renamed to `ConsoleLauncher` ===== JUnit Jupiter - `ExtensionContext.getElement()` now returns `Optional<AnnotatedElement>` ===== JUnit Vintage - ???
Remove Ivan as doc author (sorry Ivan, old asciidoc only supports one author).
IronBee Reference Manual ======================== Brian Rectanus, Ivan Ristic v0.9.0, 2010-2014 :doctype: book :encoding: utf-8 :toc2: :toclevels: 3 include::ch-preface.adoc[] include::ch-introduction.adoc[] include::ch-server-configuration.adoc[] include::ch-ironbee-configuration.adoc[] include::ch-diagnostics-devel-tools.adoc[] include::ch-inspection.adoc[] include::ch-rule-reference.adoc[] include::ch-extending-ironbee.adoc[] include::ch-installation-guide.adoc[] include::ap-configuration-examples.adoc[] include::ap-todo.adoc[] include::ap-comparison-with-modsecurity.adoc[]
IronBee Reference Manual ======================== Brian Rectanus v0.9.0, 2010-2014 :doctype: book :encoding: utf-8 :toc2: :toclevels: 3 include::ch-preface.adoc[] include::ch-introduction.adoc[] include::ch-server-configuration.adoc[] include::ch-ironbee-configuration.adoc[] include::ch-diagnostics-devel-tools.adoc[] include::ch-inspection.adoc[] include::ch-rule-reference.adoc[] include::ch-extending-ironbee.adoc[] include::ch-installation-guide.adoc[] include::ap-configuration-examples.adoc[] include::ap-todo.adoc[] include::ap-comparison-with-modsecurity.adoc[]
Update What's New for 5.8
[[new]] = What's New in Spring Security 5.8 Spring Security 5.8 provides a number of new features. Below are the highlights of the release. * https://github.com/spring-projects/spring-security/pull/11638[gh-11638] - Refresh remote JWK when unknown KID error occurs * https://github.com/spring-projects/spring-security/pull/11782[gh-11782] - @WithMockUser Supported as Merged Annotation * https://github.com/spring-projects/spring-security/issues/11661[gh-11661] - Configurable authentication converter for resource-servers with token introspection * https://github.com/spring-projects/spring-security/pull/11771[gh-11771] - `HttpSecurityDsl` should support `apply` method * https://github.com/spring-projects/spring-security/pull/11232[gh-11232] - `ClientRegistrations#rest` defines 30s connect and read timeouts * https://github.com/spring-projects/spring-security/pull/11464[gh-11464] - Remember Me supports SHA256 algorithm
[[new]] = What's New in Spring Security 5.8 Spring Security 5.8 provides a number of new features. Below are the highlights of the release. * https://github.com/spring-projects/spring-security/pull/11638[gh-11638] - Refresh remote JWK when unknown KID error occurs * https://github.com/spring-projects/spring-security/pull/11782[gh-11782] - @WithMockUser Supported as Merged Annotation * https://github.com/spring-projects/spring-security/issues/11661[gh-11661] - Configurable authentication converter for resource-servers with token introspection * https://github.com/spring-projects/spring-security/pull/11771[gh-11771] - `HttpSecurityDsl` should support `apply` method * https://github.com/spring-projects/spring-security/pull/11232[gh-11232] - `ClientRegistrations#rest` defines 30s connect and read timeouts * https://github.com/spring-projects/spring-security/pull/11464[gh-11464] - Remember Me supports SHA256 algorithm * https://github.com/spring-projects/spring-security/pull/11908[gh-11908] - Make X-Xss-Protection header value configurable in ServerHttpSecurity
Remove reference to git, prefer -b in further statement
= Full Ergodox EZ build environment for Void Linux Create a chroot like so: [source] xbps-install -S -R https://repo.voidlinux.eu/current -r /tmp/foo base-voidstrap Then you can run. INFO: /tmp/foo here must be absolute. Limitation of xbps-uunshare. [source] xbps-uunshare /tmp/foo xbps-install -- -S gcc wget unzip dfu-programmer zip make teensy_loader_cli git avr-gcc avr-libc You can fetch qmk like so: [source] xbps-uunshare /tmp/foo git -- clone --depth 1 https://github.com/qmk/qmk_firmware.git Build with [source] xbps-uunshare /tmp/foo /bin/sh -- -c '(cd /qmk_firmware && make ergodox-ez-default-teensy)'
= Full Ergodox EZ build environment for Void Linux Create a chroot like so: [source] xbps-install -S -R https://repo.voidlinux.eu/current -r /tmp/foo base-voidstrap Then you can run. INFO: /tmp/foo here must be absolute. Limitation of xbps-uunshare. [source] xbps-uunshare /tmp/foo xbps-install -- -S gcc wget unzip dfu-programmer zip make teensy_loader_cli avr-gcc avr-libc You can fetch qmk like so: [source] xbps-uunshare /tmp/foo git -- clone --depth 1 https://github.com/qmk/qmk_firmware.git Build with [source] xbps-uunshare /tmp/foo /bin/sh -- -c '(cd /qmk_firmware && make ergodox-ez-default-teensy)'
Document `--details verbose` stacktrace emission fix
[[release-notes-5.3.0-M1]] == 5.3.0-M1 *Date of Release:* ❓ *Scope:* ❓ For a complete list of all _closed_ issues and pull requests for this release, consult the link:{junit5-repo}+/milestone/23?closed=1+[5.3 M1] milestone page in the JUnit repository on GitHub. [[release-notes-5.3.0-M1-junit-platform]] === JUnit Platform ==== Bug Fixes * ❓ ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * ❓ [[release-notes-5.3.0-M1-junit-jupiter]] === JUnit Jupiter ==== Bug Fixes * ❓ ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * New `assertThrows` methods in `Assertions` provide a more specific failure message if the lambda returns a result instead of throwing the expected exception. [[release-notes-5.3.0-M1-junit-vintage]] === JUnit Vintage ==== Bug Fixes * ❓ ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * ❓
[[release-notes-5.3.0-M1]] == 5.3.0-M1 *Date of Release:* ❓ *Scope:* ❓ For a complete list of all _closed_ issues and pull requests for this release, consult the link:{junit5-repo}+/milestone/23?closed=1+[5.3 M1] milestone page in the JUnit repository on GitHub. [[release-notes-5.3.0-M1-junit-platform]] === JUnit Platform ==== Bug Fixes * Full stacktrace is printed to the console, when running the `ConsoleLauncher` in `--details verbose` mode. ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * ❓ [[release-notes-5.3.0-M1-junit-jupiter]] === JUnit Jupiter ==== Bug Fixes * ❓ ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * New `assertThrows` methods in `Assertions` provide a more specific failure message if the lambda returns a result instead of throwing the expected exception. [[release-notes-5.3.0-M1-junit-vintage]] === JUnit Vintage ==== Bug Fixes * ❓ ==== Deprecations and Breaking Changes * ❓ ==== New Features and Improvements * ❓
Update upgrade notes regarding Hibernate 5.2
==== Changes to Configuration Model In preparation for Hibernate 5.2 support the previous "SessionFactoryBean" notion has been removed. Now if you wish to customize `SessionFactory` creation you should instead register a custom `org.grails.orm.hibernate.connections.HibernateConnectionSourceFactory` in Spring.
==== Changes to Configuration Model In preparation for Hibernate 5.2 support the previous "SessionFactoryBean" notion has been removed. Now if you wish to customize `SessionFactory` creation you should instead register a custom `org.grails.orm.hibernate.connections.HibernateConnectionSourceFactory` in Spring. ==== IdentityEnumType Handling Changed Previous versions of GORM shipped with a `org.grails.orm.hibernate.cfg.IdentityEnumType` class for altering the handling of enums. In order to support different versions of Hibernate 5.x which feature different signatures for the `org.hibernate.usertype.UserType` interface this class has been removed. If you wish to obtain the same functionality you need to change your `mapping` block to: [source,groovy] ---- static mapping = { myEnum enumType:"identity" } ---- ==== Changes to Support Hibernate 5.2 Hibernate 5.2 includes many breaking API changes, in order to support Hibernate 5.2 several classes have been removed or rewritten. Including: * `org.grails.orm.hibernate.proxy.GroovyAwareJavassistLazyInitializer` * `org.grails.orm.hibernate.proxy.GroovyAwareJavassistProxyFactory` * `org.grails.orm.hibernate.persister.entity.GroovyAwareJoinedSubclassEntityPersister` * `org.grails.orm.hibernate.persister.entity.GroovyAwareSingleTableEntityPersister` Most of these classes are considered internal, however if you have extended or references these classes you may need to modify your code appropriately.
Remove another reference to 64-bit systems.
[[vm-max-map-count]] === Virtual memory Elasticsearch uses a <<default_fs,`mmapfs`>> directory by default for 64bit systems to store its indices. The default operating system limits on mmap counts is likely to be too low, which may result in out of memory exceptions. On Linux, you can increase the limits by running the following command as `root`: [source,sh] ------------------------------------- sysctl -w vm.max_map_count=262144 ------------------------------------- To set this value permanently, update the `vm.max_map_count` setting in `/etc/sysctl.conf`. To verify after rebooting, run `sysctl vm.max_map_count`. The RPM and Debian packages will configure this setting automatically. No further configuration is required.
[[vm-max-map-count]] === Virtual memory Elasticsearch uses a <<default_fs,`mmapfs`>> directory by default to store its indices. The default operating system limits on mmap counts is likely to be too low, which may result in out of memory exceptions. On Linux, you can increase the limits by running the following command as `root`: [source,sh] ------------------------------------- sysctl -w vm.max_map_count=262144 ------------------------------------- To set this value permanently, update the `vm.max_map_count` setting in `/etc/sysctl.conf`. To verify after rebooting, run `sysctl vm.max_map_count`. The RPM and Debian packages will configure this setting automatically. No further configuration is required.
Remove another reference to 64-bit systems.
[[vm-max-map-count]] === Virtual memory Elasticsearch uses a <<default_fs,`mmapfs`>> directory by default for 64bit systems to store its indices. The default operating system limits on mmap counts is likely to be too low, which may result in out of memory exceptions. On Linux, you can increase the limits by running the following command as `root`: [source,sh] ------------------------------------- sysctl -w vm.max_map_count=262144 ------------------------------------- To set this value permanently, update the `vm.max_map_count` setting in `/etc/sysctl.conf`. To verify after rebooting, run `sysctl vm.max_map_count`. The RPM and Debian packages will configure this setting automatically. No further configuration is required.
[[vm-max-map-count]] === Virtual memory Elasticsearch uses a <<default_fs,`mmapfs`>> directory by default to store its indices. The default operating system limits on mmap counts is likely to be too low, which may result in out of memory exceptions. On Linux, you can increase the limits by running the following command as `root`: [source,sh] ------------------------------------- sysctl -w vm.max_map_count=262144 ------------------------------------- To set this value permanently, update the `vm.max_map_count` setting in `/etc/sysctl.conf`. To verify after rebooting, run `sysctl vm.max_map_count`. The RPM and Debian packages will configure this setting automatically. No further configuration is required.
Update and fix errors in delete ELB docs
===== Delete Amazon Load Balancer ====== Type +deleteAmazonLoadBalancer+ ====== Description This stage provides orchestration for deleting an Amazon Elastic Load Balancer. This is a destructive process, which cannot be reversed. If the provided +loadBalancerName+ is not found for _all_ provided +regions+, the operation will fail validation. CAUTION: This operation marks the end of a Load Balancer's life. The process cannot be undone, and the configuration cannot be reconstituted. A load balancer of the same configuration will need to be recreated from scratch. ====== Services Involved _orca_, _kato_, _oort_ ====== Steps _deleteAmazonLoadBalancer_, _forceCacheRefresh_, _monitorDelete_, _sendNotification_ ====== Example Request Body [source,javascript] ---- { "type": "deleteAmazonLoadBalancer", "loadBalancerName": "kato-main-frontend", "regions": ["us-east-1", "us-west-1", "us-west-2", "eu-west-1"], "credentials": "test" } ---- ====== Description of inputs [width="100%",frame="topbot",options="header,footer"] |====================== |Key | Type | Required | Value |loadBalancerName | string | true | The name of the load balancer. |regions | array | true | An object that provides a named region to array of region names. For example, +["us-east-1", "us-west-1"]+ will inform the deployment engine to delete the ELB those specific regions. |credentials | string | true | The named account credentials that are to be used for this operation. |======================
===== Delete Amazon Load Balancer ====== Type +deleteAmazonLoadBalancer+ ====== Description This stage provides orchestration for deleting an Amazon Elastic Load Balancer. This is a destructive process, which cannot be reversed. CAUTION: This operation marks the end of a Load Balancer's life. The process cannot be undone, and the configuration cannot be reconstituted. A load balancer of the same configuration will need to be recreated from scratch. ====== Services Involved _orca_, _kato_, _oort_ ====== Steps _deleteAmazonLoadBalancer_, _forceCacheRefresh_, _monitorDelete_ ====== Example Request Body [source,javascript] ---- { "type": "deleteAmazonLoadBalancer", "loadBalancerName": "kato-main-frontend", "regions": ["us-east-1", "us-west-1", "us-west-2", "eu-west-1"], "credentials": "test" } ---- ====== Description of inputs [width="100%",frame="topbot",options="header,footer"] |====================== |Key | Type | Required | Value |loadBalancerName | string | true | The name of the load balancer. |regions | array | true | An object that provides a named region to array of region names. For example, +["us-east-1", "us-west-1"]+ will inform the deployment engine to delete from those specific regions. |credentials | string | true | The named account credentials that are to be used for this operation. |======================
Fix broken cross link in documentation
[[breaking_70_plugins_changes]] === Plugins changes ==== Azure Repository plugin * The legacy azure settings which where starting with `cloud.azure.storage.` prefix have been removed. This includes `account`, `key`, `default` and `timeout`. You need to use settings which are starting with `azure.client.` prefix instead. * Global timeout setting `cloud.azure.storage.timeout` has been removed. You must set it per azure client instead. Like `azure.client.default.timeout: 10s` for example. See {plugins}/repository-azure-usage.html#repository-azure-repository-settings[Azure Repository settings]. ==== Google Cloud Storage Repository plugin * The repository settings `application_name`, `connect_timeout` and `read_timeout` have been removed and must now be specified in the client settings instead. See {plugins}/repository-gcs-client.html#repository-gcs-client[Google Cloud Storage Client Settings].
[[breaking_70_plugins_changes]] === Plugins changes ==== Azure Repository plugin * The legacy azure settings which where starting with `cloud.azure.storage.` prefix have been removed. This includes `account`, `key`, `default` and `timeout`. You need to use settings which are starting with `azure.client.` prefix instead. * Global timeout setting `cloud.azure.storage.timeout` has been removed. You must set it per azure client instead. Like `azure.client.default.timeout: 10s` for example. See {plugins}/repository-azure-repository-settings.html#repository-azure-repository-settings[Azure Repository settings]. ==== Google Cloud Storage Repository plugin * The repository settings `application_name`, `connect_timeout` and `read_timeout` have been removed and must now be specified in the client settings instead. See {plugins}/repository-gcs-client.html#repository-gcs-client[Google Cloud Storage Client Settings].
Fix GitHub repo url in adoc files
= Spring Cloud Data Flow Reference Guide Sabby Anandan; Marius Bogoevici; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Patrick Peralta; Glenn Renfro; Thomas Risberg; Dave Syer; David Turanski; Janne Valkealahti :doctype: book :toc: :toclevels: 4 :source-highlighter: prettify :numbered: :icons: font :hide-uri-scheme: :spring-cloud-dataflow-docs: http://docs.spring.io/spring-cloud-dataflow/docs/{project-version}/reference :spring-cloud-dataflow-docs-current: http://docs.spring.io/spring-cloud-dataflow/docs/current-SNAPSHOT/reference/html/ :github-repo: spring-projects/spring-cloud-dataflow :github-code: http://github.com/{github-repo} :dataflow-asciidoc: https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc // ====================================================================================== include::preface.adoc[] include::spring-cloud-dataflow-overview.adoc[] include::architecture.adoc[] include::getting-started.adoc[] include::streams.adoc[] include::tasks.adoc[] include::dashboard.adoc[] include::howto.adoc[] include::appendix.adoc[] // ======================================================================================
= Spring Cloud Data Flow Reference Guide Sabby Anandan; Marius Bogoevici; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Patrick Peralta; Glenn Renfro; Thomas Risberg; Dave Syer; David Turanski; Janne Valkealahti :doctype: book :toc: :toclevels: 4 :source-highlighter: prettify :numbered: :icons: font :hide-uri-scheme: :spring-cloud-dataflow-docs: http://docs.spring.io/spring-cloud-dataflow/docs/{project-version}/reference :spring-cloud-dataflow-docs-current: http://docs.spring.io/spring-cloud-dataflow/docs/current-SNAPSHOT/reference/html/ :github-repo: spring-cloud/spring-cloud-dataflow :github-code: http://github.com/{github-repo} :dataflow-asciidoc: https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/master/spring-cloud-dataflow-docs/src/main/asciidoc // ====================================================================================== include::preface.adoc[] include::spring-cloud-dataflow-overview.adoc[] include::architecture.adoc[] include::getting-started.adoc[] include::streams.adoc[] include::tasks.adoc[] include::dashboard.adoc[] include::howto.adoc[] include::appendix.adoc[] // ======================================================================================
Update title and email. Add section numbers.
// // Copyright (c) 2016-2017 Eclipse Microprofile Contributors: // Red Hat // // 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. // = Interoperable JWT RBAC for Microprofile :author: Scott Stark; Pedro Igor Silva :email: sstark@redhat.com :revnumber: 1.0 :revdate: 2017-09-14 :revremark: Proposed Final Draft :version-label!: :sectanchors: :doctype: book :license: Apache License v2.0 :source-highlighter: coderay :toc: left :toclevels: 4 :sectnumlevels: 4 ifdef::backend-pdf[] :pagenums: endif::[] include::license-alv2.asciidoc[] include::background.asciidoc[] include::interoperability.asciidoc[] include::future-directions.asciidoc[] include::sample-impl.asciidoc[]
// // Copyright (c) 2016-2017 Eclipse Microprofile Contributors: // Red Hat // // 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. // = Eclipse MicroProfile Interoperable JWT RBAC :author: Scott Stark; Pedro Igor Silva :email: microprofile@googlegroups.com :revnumber: 1.0 :revdate: 2017-09-14 :revremark: Proposed Final Draft :version-label!: :sectanchors: :doctype: book :license: Apache License v2.0 :source-highlighter: coderay :toc: left :toclevels: 4 :sectnumlevels: 4 ifdef::backend-pdf[] :pagenums: :numbered: endif::[] include::license-alv2.asciidoc[] include::background.asciidoc[] include::interoperability.asciidoc[] include::future-directions.asciidoc[] include::sample-impl.asciidoc[]
Fix missing comma and boolean true
[[search-aggregations-metrics-geobounds-aggregation]] === Geo Bounds Aggregation A metric aggregation that computes the bounding box containing all geo_point values for a field. .Experimental! [IMPORTANT] ===== This feature is marked as experimental, and may be subject to change in the future. If you use this feature, please let us know your experience with it! ===== Example: [source,js] -------------------------------------------------- { "query" : { "match" : { "business_type" : "shop" } }, "aggs" : { "viewport" : { "geo_bounds" : { "field" : "location" <1> "wrap_longitude" : "true" <2> } } } } -------------------------------------------------- <1> The `geo_bounds` aggregation specifies the field to use to obtain the bounds <2> `wrap_longitude` is an optional parameter which specifies whether the bounding box should be allowed to overlap the international date line. The default value is `true` The above aggregation demonstrates how one would compute the bounding box of the location field for all documents with a business type of shop The response for the above aggregation: [source,js] -------------------------------------------------- { ... "aggregations": { "viewport": { "bounds": { "top_left": { "lat": 80.45, "lon": -160.22 }, "bottom_right": { "lat": 40.65, "lon": 42.57 } } } } } --------------------------------------------------
[[search-aggregations-metrics-geobounds-aggregation]] === Geo Bounds Aggregation A metric aggregation that computes the bounding box containing all geo_point values for a field. .Experimental! [IMPORTANT] ===== This feature is marked as experimental, and may be subject to change in the future. If you use this feature, please let us know your experience with it! ===== Example: [source,js] -------------------------------------------------- { "query" : { "match" : { "business_type" : "shop" } }, "aggs" : { "viewport" : { "geo_bounds" : { "field" : "location", <1> "wrap_longitude" : true <2> } } } } -------------------------------------------------- <1> The `geo_bounds` aggregation specifies the field to use to obtain the bounds <2> `wrap_longitude` is an optional parameter which specifies whether the bounding box should be allowed to overlap the international date line. The default value is `true` The above aggregation demonstrates how one would compute the bounding box of the location field for all documents with a business type of shop The response for the above aggregation: [source,js] -------------------------------------------------- { ... "aggregations": { "viewport": { "bounds": { "top_left": { "lat": 80.45, "lon": -160.22 }, "bottom_right": { "lat": 40.65, "lon": 42.57 } } } } } --------------------------------------------------
Fix missing comma and boolean true
[[search-aggregations-metrics-geobounds-aggregation]] === Geo Bounds Aggregation A metric aggregation that computes the bounding box containing all geo_point values for a field. .Experimental! [IMPORTANT] ===== This feature is marked as experimental, and may be subject to change in the future. If you use this feature, please let us know your experience with it! ===== Example: [source,js] -------------------------------------------------- { "query" : { "match" : { "business_type" : "shop" } }, "aggs" : { "viewport" : { "geo_bounds" : { "field" : "location" <1> "wrap_longitude" : "true" <2> } } } } -------------------------------------------------- <1> The `geo_bounds` aggregation specifies the field to use to obtain the bounds <2> `wrap_longitude` is an optional parameter which specifies whether the bounding box should be allowed to overlap the international date line. The default value is `true` The above aggregation demonstrates how one would compute the bounding box of the location field for all documents with a business type of shop The response for the above aggregation: [source,js] -------------------------------------------------- { ... "aggregations": { "viewport": { "bounds": { "top_left": { "lat": 80.45, "lon": -160.22 }, "bottom_right": { "lat": 40.65, "lon": 42.57 } } } } } --------------------------------------------------
[[search-aggregations-metrics-geobounds-aggregation]] === Geo Bounds Aggregation A metric aggregation that computes the bounding box containing all geo_point values for a field. .Experimental! [IMPORTANT] ===== This feature is marked as experimental, and may be subject to change in the future. If you use this feature, please let us know your experience with it! ===== Example: [source,js] -------------------------------------------------- { "query" : { "match" : { "business_type" : "shop" } }, "aggs" : { "viewport" : { "geo_bounds" : { "field" : "location", <1> "wrap_longitude" : true <2> } } } } -------------------------------------------------- <1> The `geo_bounds` aggregation specifies the field to use to obtain the bounds <2> `wrap_longitude` is an optional parameter which specifies whether the bounding box should be allowed to overlap the international date line. The default value is `true` The above aggregation demonstrates how one would compute the bounding box of the location field for all documents with a business type of shop The response for the above aggregation: [source,js] -------------------------------------------------- { ... "aggregations": { "viewport": { "bounds": { "top_left": { "lat": 80.45, "lon": -160.22 }, "bottom_right": { "lat": 40.65, "lon": 42.57 } } } } } --------------------------------------------------
Add readme reference to license.
:libVersion: 0.1.7 # ADAL image:https://api.bintray.com/packages/jmspt/maven/adal/images/download.svg[Build Status,link=https://bintray.com/jmspt/maven/adal/_latestVersion] Android Development Accelaration Library Add the dependency in the form: [source, groovy, subs='attributes'] dependencies { /* Include all modules */ compile 'com.massivedisaster.adal:adal:{libVersion}' /* Specific modules*/ compile 'com.massivedisaster.adal:adal-accounts:{libVersion}' compile 'com.massivedisaster.adal:adal-adapters:{libVersion}' compile 'com.massivedisaster.adal:adal-analytics:{libVersion}' compile 'com.massivedisaster.adal:adal-bus:{libVersion}' compile 'com.massivedisaster.adal:adal-fragments:{libVersion}' compile 'com.massivedisaster.adal:adal-managers:{libVersion}' compile 'com.massivedisaster.adal:adal-network:{libVersion}' compile 'com.massivedisaster.adal:adal-utils:{libVersion}' compile 'com.massivedisaster.adal:adal-location:{libVersion}' }
:libVersion: 0.1.7 # ADAL image:https://api.bintray.com/packages/jmspt/maven/adal/images/download.svg[Build Status,link=https://bintray.com/jmspt/maven/adal/_latestVersion] Android Development Accelaration Library Add the dependency in the form: [source, groovy, subs='attributes'] dependencies { /* Include all modules */ compile 'com.massivedisaster.adal:adal:{libVersion}' /* Specific modules*/ compile 'com.massivedisaster.adal:adal-accounts:{libVersion}' compile 'com.massivedisaster.adal:adal-adapters:{libVersion}' compile 'com.massivedisaster.adal:adal-analytics:{libVersion}' compile 'com.massivedisaster.adal:adal-bus:{libVersion}' compile 'com.massivedisaster.adal:adal-fragments:{libVersion}' compile 'com.massivedisaster.adal:adal-managers:{libVersion}' compile 'com.massivedisaster.adal:adal-network:{libVersion}' compile 'com.massivedisaster.adal:adal-utils:{libVersion}' compile 'com.massivedisaster.adal:adal-location:{libVersion}' } ### License [GNU LESSER GENERAL PUBLIC LICENSE](LICENSE.md)
Fix type on Clojutre start date
= clojuTRE clojuTRE 2017-09-02 :jbake-type: event :jbake-edition: 2017 :jbake-link: http://clojutre.org/2017/ :jbake-location: Tampere, Finland :jbake-start: 2017-09-92 :jbake-end: 2017-09-02 clojuTRE is a free Clojure conference organized by http://www.metosin.fi/[Metosin]. The event has single track, late start, short talks (20 minutes and 5 minutes Q&A) and a funky after party for networking, discussions and draft beer. We welcome both newbies and seasoned Clojurists.
= clojuTRE clojuTRE 2017-09-02 :jbake-type: event :jbake-edition: 2017 :jbake-link: http://clojutre.org/2017/ :jbake-location: Tampere, Finland :jbake-start: 2017-09-02 :jbake-end: 2017-09-02 clojuTRE is a Clojure conference organized by http://www.metosin.fi/[Metosin]. The event has single track, late start, short talks (20 minutes and 5 minutes Q&A) and a funky after party for networking, discussions and draft beer. We welcome both newbies and seasoned Clojurists.
Make admin page info panel dismissible
ο»Ώ<%@ Control Language="C#" AutoEventWireup="false" EnableViewState="false" Inherits="R7.Epsilon.AdminPageInfo" %> <%@ Import Namespace="DotNetNuke.Security" %> <% if (PortalSecurity.IsInRole ("Administrators")) { %> <div class="skin-admin-page-info alert alert-warning"> <a class="skin-page-permalink" href="<%= PagePermalink %>" title="<%: Localizer.GetString ("PagePermalink.Tooltip") %>"><%= Localizer.GetString ("PagePermalink.Text") %></a> </div> <% } %>
ο»Ώ<%@ Control Language="C#" AutoEventWireup="false" EnableViewState="false" Inherits="R7.Epsilon.AdminPageInfo" %> <%@ Import Namespace="DotNetNuke.Security" %> <% if (PortalSecurity.IsInRole ("Administrators")) { %> <div class="skin-admin-page-info alert alert-info alert-dismissible"> <button type="button" class="close" data-dismiss="alert"><span>&times;</span></button> <a class="skin-page-permalink" href="<%= PagePermalink %>" title="<%: Localizer.GetString ("PagePermalink.Tooltip") %>"><%= Localizer.GetString ("PagePermalink.Text") %></a> </div> <% } %>
Use UserController.Instance, rename formal parameter
ο»Ώ<%@ Application Inherits="DotNetNuke.Web.Common.Internal.DotNetNukeHttpApplication" Language="C#" %> <%@ Import Namespace="DotNetNuke.Entities.Portals" %> <%@ Import Namespace="DotNetNuke.Entities.Users" %> <%@ Import Namespace="R7.Epsilon.Components" %> <script runat="server"> public override string GetVaryByCustomString (HttpContext context, string arg) { var result = string.Empty; foreach (var part in arg.Split (';')) { if (part == "PortalId") { result += "portalid=" + PortalSettings.Current.PortalId; } else if (part == "UserRoles") { if (Request.IsAuthenticated) { var user = UserController.GetCurrentUserInfo (); if (user != null) result += "userroles=" + Utils.FormatList (",", (Array)user.Roles); } } else { result += base.GetVaryByCustomString (context, arg); } } return result; } </script>
ο»Ώ<%@ Application Inherits="DotNetNuke.Web.Common.Internal.DotNetNukeHttpApplication" Language="C#" %> <%@ Import Namespace="DotNetNuke.Entities.Portals" %> <%@ Import Namespace="DotNetNuke.Entities.Users" %> <%@ Import Namespace="R7.Epsilon.Components" %> <script runat="server"> public override string GetVaryByCustomString (HttpContext context, string custom) { var result = string.Empty; foreach (var part in custom.Split (';')) { if (part == "PortalId") { result += "portalid=" + PortalSettings.Current.PortalId; } else if (part == "UserRoles") { if (Request.IsAuthenticated) { var user = UserController.Instance.GetCurrentUserInfo (); if (user != null) { result += "userroles=" + Utils.FormatList (",", (Array) user.Roles); } } } else { result += base.GetVaryByCustomString (context, custom); } } return result; } </script>
Add logo option, header font type, size, color
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <meta http-equiv="Refresh" content="60" /> <title>TeamTracker</title> <link rel="icon" href="team.png"> </head> <body> <b>Support Team Availability Matrix</b> <form id="Body" runat="server"> <asp:table id="StatusTable" runat="server" CellPadding="5" /> </form> v1.0 </body> </html>
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <meta http-equiv="Refresh" content="60" /> <title>TeamTracker</title> <link rel="icon" href="team.png"> </head> <body> <img src="Logo.png" style="width:24px;height:24px;"> <font face="Arial" size="5" color="black"> <b>Support Team Availability Matrix</b> </font> <form id="Body" runat="server"> <asp:table id="StatusTable" runat="server" CellPadding="5" /> </form> v1.0 </body> </html>
Fix for U4-4026 Inline styling affect header text
<%@ Page Language="c#" CodeBehind="editLanguage.aspx.cs" AutoEventWireup="True" MasterPageFile="../masterpages/umbracoPage.Master" Inherits="umbraco.settings.editLanguage" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <asp:Content ContentPlaceHolderID="body" runat="server"> <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true" Style="text-align: center"> <cc1:Pane ID="Pane7" runat="server"> <cc1:PropertyPanel runat="server" ID="pp_language"> <asp:DropDownList ID="Cultures" runat="server"> </asp:DropDownList> </cc1:PropertyPanel> </cc1:Pane> </cc1:UmbracoPanel> <script type="text/javascript"> jQuery(document).ready(function () { UmbClientMgr.appActions().bindSaveShortCut(); }); </script> </asp:Content>
<%@ Page Language="c#" CodeBehind="editLanguage.aspx.cs" AutoEventWireup="True" MasterPageFile="../masterpages/umbracoPage.Master" Inherits="umbraco.settings.editLanguage" %> <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> <asp:Content ContentPlaceHolderID="body" runat="server"> <cc1:UmbracoPanel ID="Panel1" runat="server" Width="608px" Height="336px" hasMenu="true"> <cc1:Pane ID="Pane7" runat="server"> <cc1:PropertyPanel runat="server" ID="pp_language"> <asp:DropDownList ID="Cultures" runat="server"> </asp:DropDownList> </cc1:PropertyPanel> </cc1:Pane> </cc1:UmbracoPanel> <script type="text/javascript"> jQuery(document).ready(function () { UmbClientMgr.appActions().bindSaveShortCut(); }); </script> </asp:Content>
Change the paragraph tag to an anchor tag linked to the item. Also added specific blue text "Click here to register."
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IQueryable<CRP.Core.Domain.Item>>" %> <%@ Import Namespace="CRP.Core.Resources"%> <%@ Import Namespace="CRP.Controllers"%> <table class="itembrowsetable"> <thead> </thead> <tbody> <% // for loop to go through all the items passed foreach(var item in Model) { %> <tr> <td> <a href='<%= Url.Action("Details", "Item", new {id = item.Id}) %>'> <h1><%= Html.Encode(item.Name) %></h1> <img src='<%= Url.Action("GetImage", "Item", new {id = item.Id}) %>' /> <h3>Last day to register online: <%= Html.Encode(item.Expiration.HasValue ? item.Expiration.Value.ToString("D") : string.Empty) %></h3> <% Html.RenderPartial(StaticValues.Partial_TagView, item.Tags); %> <p> <%= Html.Encode(item.Summary) %> <%--<%= item.Description.Length > 1000 ? Html.HtmlEncode(item.Description.Substring(0, 1000)) : Html.HtmlEncode(item.Description) %>--%> </p> </a> </td> </tr> <% } %> </tbody> </table>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IQueryable<CRP.Core.Domain.Item>>" %> <%@ Import Namespace="CRP.Core.Resources"%> <%@ Import Namespace="CRP.Controllers"%> <table class="itembrowsetable"> <thead> </thead> <tbody> <% // for loop to go through all the items passed foreach(var item in Model) { %> <tr> <td> <a href='<%= Url.Action("Details", "Item", new {id = item.Id}) %>'> <h1><%= Html.Encode(item.Name) %></h1> <img src='<%= Url.Action("GetImage", "Item", new {id = item.Id}) %>' /> <h3>Last day to register online: <%= Html.Encode(item.Expiration.HasValue ? item.Expiration.Value.ToString("D") : string.Empty) %></h3> <% Html.RenderPartial(StaticValues.Partial_TagView, item.Tags); %> <a href='<%= Url.Action("Details", "Item", new {id = item.Id}) %>'> <%= Html.Encode(item.Summary) %> <%--<%= item.Description.Length > 1000 ? Html.HtmlEncode(item.Description.Substring(0, 1000)) : Html.HtmlEncode(item.Description) %>--%> </a> <%Item item1 = item;%><%= Html.ActionLink<ItemController>(a => a.Details(item1.Id), "Click here to register.", new{style="color: rgb(0, 0, 255)"}) %> </a> </td> </tr> <% } %> </tbody> </table>
Make aside panes wider GH-79
<div class="container"> <div class="row"> <div id="ContentTopPane" runat="server" class="col" /> </div> <div class="row"> <main id="ContentPane" runat="server" class="col-md-9 col-sm-7 skin-autoexpand-pane" /> <aside id="AsidePane" runat="server" class="col-md-3 col-sm-5" containertype="G" containername="R7.Epsilon" containersrc="Default_H3.ascx" /> </div> <div class="row"> <div id="ContentBottomPane" runat="server" class="col" /> </div> </div>
<div class="container"> <div class="row"> <div id="ContentTopPane" runat="server" class="col" /> </div> <div class="row"> <main id="ContentPane" runat="server" class="col-md-8 col-sm-7 skin-autoexpand-pane" /> <aside id="AsidePane" runat="server" class="col-md-4 col-sm-5" containertype="G" containername="R7.Epsilon" containersrc="Default_H3.ascx" /> </div> <div class="row"> <div id="ContentBottomPane" runat="server" class="col" /> </div> </div>
Revert "Added a very special div"
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="default.aspx.cs" Inherits="_Default" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <title>Test Form</title> <link rel="icon" href="favicon.ico"/> </head> <body> <form id="form1" runat="server"> <div> <asp:TextBox ID="TextBox1" runat="server" OnTextChanged="TextBox1_TextChanged"></asp:TextBox> <asp:CheckBox ID="CheckBox1" runat="server" OnCheckedChanged="CheckBox1_CheckedChanged" /> <br /> <input id="Submit1" type="submit" value="Submit" /><hr /> </div> <div> <asp:Label ID="Label1" runat="server" Text="Label"></asp:Label> <br /> <asp:Label ID="Label2" runat="server" Text="Label"></asp:Label> </div> <img alt="" src="" style="height: 250px" /><input id="Text1" type="text" /></form> <p> &nbsp;</p> <p> &nbsp;</p> <div> </div> </body> </html>
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="default.aspx.cs" Inherits="_Default" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <title>Test Form</title> <link rel="icon" href="favicon.ico"/> </head> <body> <form id="form1" runat="server"> <div> <asp:TextBox ID="TextBox1" runat="server" OnTextChanged="TextBox1_TextChanged"></asp:TextBox> <asp:CheckBox ID="CheckBox1" runat="server" OnCheckedChanged="CheckBox1_CheckedChanged" /> <br /> <input id="Submit1" type="submit" value="Submit" /><hr /> </div> <div> <asp:Label ID="Label1" runat="server" Text="Label"></asp:Label> <br /> <asp:Label ID="Label2" runat="server" Text="Label"></asp:Label> </div> <img alt="" src="" style="height: 250px" /><input id="Text1" type="text" /></form> <p> &nbsp;</p> <p> &nbsp;</p> </body> </html>
Document Library Picker - Fix Search Highlighting
<div> <ui-select ng-model="ctrl.documentLibrary.selected" theme="bootstrap"> <ui-select-match placeholder="Select or search for a document library..."> <div ng-if="$select.selected"> <img ng-src="{{ctrl.siteUrl + $select.selected.ImageUrl}}" style="vertical-align: baseline"/> <span style="padding-left: 5px;">{{$select.selected.Title}}&nbsp;<small>({{$select.selected.RootFolder.ServerRelativeUrl}})</small></span> </div> </ui-select-match> <ui-select-choices repeat="item in ctrl.documentLibraries | filter: $select.search"> <div> <img ng-src="{{ctrl.siteUrl + item.ImageUrl}}"/> <span style="padding-left: 5px;">{{item.Title | highlight: $select.search}}&nbsp;<small>({{item.RootFolder.ServerRelativeUrl}})</small></span> </div> <small> <span data-ng-if="item.Description" ng-bind="item.Description"></span> <span data-ng-if="!item.Description"><i>No Description</i></span> </small> </ui-select-choices> </ui-select> </div>
<div> <ui-select ng-model="ctrl.documentLibrary.selected" theme="bootstrap"> <ui-select-match placeholder="Select or search for a document library..."> <div ng-if="$select.selected"> <img ng-src="{{ctrl.siteUrl + $select.selected.ImageUrl}}" style="vertical-align: baseline"/> <span style="padding-left: 5px;">{{$select.selected.Title}}&nbsp;<small>({{$select.selected.RootFolder.ServerRelativeUrl}})</small></span> </div> </ui-select-match> <ui-select-choices repeat="item in ctrl.documentLibraries | filter: $select.search"> <div> <img ng-src="{{ctrl.siteUrl + item.ImageUrl}}"/> <span style="padding-left: 5px;" ng-bind-html="item.Title | highlight: $select.search"></span>&nbsp;<small>({{item.RootFolder.ServerRelativeUrl}})</small> </div> <small> <span data-ng-if="item.Description" ng-bind="item.Description"></span> <span data-ng-if="!item.Description"><i>No Description</i></span> </small> </ui-select-choices> </ui-select> </div>
Adjust so packages.config points to resources repo
<% Response.Redirect("https://raw.githubusercontent.com/cake-build/example/master/tools/packages.config") %>
<% Response.Redirect("https://raw.githubusercontent.com/cake-build/resources/master/packages.config") %>
Fix for setting value update after key was made read-only.
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Settings.aspx.cs" Inherits="Settings" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <title>Settings</title> </head> <body> <a href="Default.aspx">Back</a> <form id="SettingsForm" runat="server"> <div> <asp:SqlDataSource ID="dataSource" Runat="server" SelectCommand="SELECT * FROM Setting" UpdateCommand="UPDATE Setting SET [key]=@key, value=@value WHERE id=@id" DataSourceMode="DataSet"> </asp:SqlDataSource> <asp:GridView ID="settingsView" Runat="server" DataSourceID="dataSource" AutoGenerateColumns="false" DataKeyNames="id" ShowHeader="true" ShowFooter="false"> <AlternatingRowStyle BackColor="LightBlue" /> <Columns> <asp:CommandField ShowEditButton="true" ShowDeleteButton="false" /> <asp:BoundField HeaderText="Key" ReadOnly="true" DataField="key" /> <asp:BoundField HeaderText="Value" ReadOnly="false" DataField="value" /> </Columns> </asp:GridView> </div> </form> </body> </html>
ο»Ώ<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Settings.aspx.cs" Inherits="Settings" %> <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head runat="server"> <title>Settings</title> </head> <body> <a href="Default.aspx">Back</a> <form id="SettingsForm" runat="server"> <div> <asp:SqlDataSource ID="dataSource" Runat="server" SelectCommand="SELECT * FROM Setting" UpdateCommand="UPDATE Setting SET value=@value WHERE id=@id" DataSourceMode="DataSet"> </asp:SqlDataSource> <asp:GridView ID="settingsView" Runat="server" DataSourceID="dataSource" AutoGenerateColumns="false" DataKeyNames="id" ShowHeader="true" ShowFooter="false"> <AlternatingRowStyle BackColor="LightBlue" /> <Columns> <asp:CommandField ShowEditButton="true" ShowDeleteButton="false" /> <asp:BoundField HeaderText="Key" ReadOnly="true" DataField="key" /> <asp:BoundField HeaderText="Value" ReadOnly="false" DataField="value" /> </Columns> </asp:GridView> </div> </form> </body> </html>
Fix typo from previous merge
ο»Ώ<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %> <%@ Import Namespace="Orchard.Users.ViewModels"%> <h1 class="page-title"><%=Html.TitleForPage(Model.Title)%></h1> <p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%></p> <%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%> <% using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %> <fieldset class="login-form"> <legend><%=_Encoded("Account Information")%></legend> <div class="group"> <label for="username"><%=_Encoded("Username:")%></label> <%= Html.TextBox("userNameOfEmail", "", new { autofocus = "autofocus" })%> <%= Html.ValidationMessage("userNameOrEmail")%> </div> <div class="group"> <label for="password"><%=_Encoded("Password:")%></label> <%= Html.Password("password")%> <%= Html.ValidationMessage("password")%> </div> <div class="group"> <%= Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label> </div> <input type="submit" value="<%=_Encoded("Log On") %>" /> </fieldset><% } %>
ο»Ώ<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<LogOnViewModel>" %> <%@ Import Namespace="Orchard.Users.ViewModels"%> <h1 class="page-title"><%=Html.TitleForPage(Model.Title)%></h1> <p><%=_Encoded("Please enter your username and password.")%> <%= Html.ActionLink("Register", "Register")%><%=_Encoded(" if you don't have an account.")%></p> <%= Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())%> <% using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) { %> <fieldset class="login-form"> <legend><%=_Encoded("Account Information")%></legend> <div class="group"> <label for="username"><%=_Encoded("Username:")%></label> <%= Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%> <%= Html.ValidationMessage("userNameOrEmail")%> </div> <div class="group"> <label for="password"><%=_Encoded("Password:")%></label> <%= Html.Password("password")%> <%= Html.ValidationMessage("password")%> </div> <div class="group"> <%= Html.CheckBox("rememberMe")%><label class="forcheckbox" for="rememberMe"><%=_Encoded("Remember me?")%></label> </div> <input type="submit" value="<%=_Encoded("Log On") %>" /> </fieldset><% } %>
Fix BottomPane is missing in 2cols layout
<div class="container"> <div class="row"> <div id="BottomPane1" runat="server" class="col-md-6" /> <div id="BottomPane2" runat="server" class="col-md-6" /> <div id="BottomPane3" runat="server" class="col-md-6" /> <div id="BottomPane4" runat="server" class="col-md-6" /> <div id="BottomPane5" runat="server" class="col-md-6" /> <div id="BottomPane6" runat="server" class="col-md-6" /> <div id="BottomPane7" runat="server" class="col-md-6" /> <div id="BottomPane8" runat="server" class="col-md-6" /> <div id="BottomPane9" runat="server" class="col-md-6" /> <div id="BottomPane10" runat="server" class="col-md-6" /> <div id="BottomPane11" runat="server" class="col-md-6" /> <div id="BottomPane12" runat="server" class="col-md-6" /> </div> </div>
<div class="container"> <div class="row"> <div id="BottomPane1" runat="server" class="col-md-6" /> <div id="BottomPane2" runat="server" class="col-md-6" /> <div id="BottomPane3" runat="server" class="col-md-6" /> <div id="BottomPane4" runat="server" class="col-md-6" /> <div id="BottomPane5" runat="server" class="col-md-6" /> <div id="BottomPane6" runat="server" class="col-md-6" /> <div id="BottomPane7" runat="server" class="col-md-6" /> <div id="BottomPane8" runat="server" class="col-md-6" /> <div id="BottomPane9" runat="server" class="col-md-6" /> <div id="BottomPane10" runat="server" class="col-md-6" /> <div id="BottomPane11" runat="server" class="col-md-6" /> <div id="BottomPane12" runat="server" class="col-md-6" /> </div> <div class="row"> <div id="BottomPane" runat="server" class="col" /> </div> </div>
Remove "+New Translation" link on the front-end (keep in "Manage Content" though).
ο»Ώ<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel>" %> <% Html.RegisterStyle("base.css"); %> <div class="content-localization"><% if (Model.Localizations.Count() > 0) { %> <%--//todo: need this info in the view model--%> <div class="content-localizations"><%:Html.UnorderedList(Model.Localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations") %></div><% } %> <div class="add-localization"><%:Html.ActionLink(T("+ New translation").Text, "translate", "admin", new { area = "Localization", id = Model.MasterId }, null)%></div> </div>
ο»Ώ<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel>" %>
Fix for a rare problem that could occur if there was an exception very early in the ASP.NET page life-cycle (before the "forum" control was instantiated)
<%@ Page Language="C#" AutoEventWireup="true" ValidateRequest="false" %> <script runat="server"> public void Page_Error( object sender, System.EventArgs e ) { Exception x = Server.GetLastError(); YAF.Classes.Data.DB.eventlog_create( forum.PageUserID, this, x ); YAF.Classes.Utils.CreateMail.CreateLogEmail( x ); } </script> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head id="YafHead" runat="server"> <meta name="Description" content="A bulletin board system written in ASP.NET" /> <meta name="Keywords" content="Yet Another Forum.net, Forum, ASP.NET, BB, Bulletin Board, opensource" /> <title>This title is overwritten</title> </head> <body> <img src="~/images/YAFLogo.jpg" runat="server" alt="YetAnotherForum" id="imgBanner" /><br/> <form id="form1" runat="server" enctype="multipart/form-data"> <YAF:Forum runat="server" ID="forum"></YAF:Forum> </form> </body> </html>
<%@ Page Language="C#" AutoEventWireup="true" ValidateRequest="false" %> <script runat="server"> public void Page_Error( object sender, System.EventArgs e ) { Exception x = Server.GetLastError(); YAF.Classes.Data.DB.eventlog_create( YafContext.Current.PageUserID, this, x ); YAF.Classes.Utils.CreateMail.CreateLogEmail( x ); } </script> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head id="YafHead" runat="server"> <meta name="Description" content="A bulletin board system written in ASP.NET" /> <meta name="Keywords" content="Yet Another Forum.net, Forum, ASP.NET, BB, Bulletin Board, opensource" /> <title>This title is overwritten</title> </head> <body> <img src="~/images/YAFLogo.jpg" runat="server" alt="YetAnotherForum" id="imgBanner" /><br/> <form id="form1" runat="server" enctype="multipart/form-data"> <YAF:Forum runat="server" ID="forum"></YAF:Forum> </form> </body> </html>
Add missing li to term list, adjust visual style
ο»Ώ<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="TermLinks.ascx.cs" Inherits="R7.News.Controls.TermLinks" %> <asp:ListView id="listTermLinks" runat="server" DataKeyNames="TermId"> <LayoutTemplate> <ul runat="server"> <li runat="server" id="itemPlaceholder"></li> </ul> </LayoutTemplate> <ItemTemplate> <a href="<%# Eval ("Url") %>"><%# Eval ("Name") %></a> </ItemTemplate> </asp:ListView>
ο»Ώ<%@ Control Language="C#" AutoEventWireup="false" CodeBehind="TermLinks.ascx.cs" Inherits="R7.News.Controls.TermLinks" %> <asp:ListView id="listTermLinks" runat="server" DataKeyNames="TermId"> <LayoutTemplate> <ul runat="server" class="list-inline small" style="margin-left:inherit"> <li runat="server" id="itemPlaceholder"></li> </ul> </LayoutTemplate> <ItemTemplate> <li style="padding-left:inherit"><a href="<%# Eval ("Url") %>"><%# Eval ("Name") %></a></li> </ItemTemplate> </asp:ListView>
Update to U4-1485 for 4.11.4
<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" > <head> <title>The website is restarting</title> <META HTTP-EQUIV=REFRESH CONTENT="10; URL=<%=Request["url"] %>"> </head> <body> <h1>The website is restarting</h1> <p>Please wait for 10s while we prepare to serve the page you have requested...</p> <p style="border-top: 1px solid #ccc; padding-top: 10px;"> <small>You can modify the design of this page by editing /config/splashes/booting.aspx</small> </p> </body> </html>
<%@ Page Language="C#" AutoEventWireup="true" Inherits="System.Web.UI.Page" %> <% // NH: Adds this inline check to avoid a simple codebehind file in the legacy project! if (!umbraco.cms.helpers.url.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri)) { throw new ArgumentException("Can't redirect to the requested url - it's not local or an approved proxy url", "url"); } %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>The website is restarting</title> <meta http-equiv="REFRESH" content="10; URL=<%=Request["url"] %>"> </head> <body> <h1>The website is restarting</h1> <p>Please wait for 10s while we prepare to serve the page you have requested...</p> <p style="border-top: 1px solid #ccc; padding-top: 10px;"> <small>You can modify the design of this page by editing /config/splashes/booting.aspx</small> </p> </body> </html>
Test MapPath on relative paths
<%@ PAGE LANGUAGE = C# %> <%-- -- Test calling map path on a relative path. This should print -- the full path of map-path.aspx --%> <html> <script runat=server> void Page_Load() { Response.Write (Server.MapPath ("map-path.aspx")); } </script> <body> </body> </html>
Fix for lack of formatting.
<%@ Page Language="c#" CodeFile="error.aspx.cs" AutoEventWireup="True" Inherits="YAF.error" %> <html> <head> <title>Forum Error</title> <link type="text/css" rel="stylesheet" href="resources/forum.css" /> <link type="text/css" rel="stylesheet" href="themes/yafpro/theme.css" /> </head> <body> <br /> <table class="content" width="100%" cellspacing="1" cellpadding="0"> <tr> <td class="header1"> Forum Error</td> </tr> <tr> <td class="post" align="center" style="font-size:9pt;color:#990000;"> <br /> <asp:Label ID="ErrorMsg" Enabled="true" runat="server" /> <br /><br /> </td> </tr> <tr> <td class="footer1" align="center"> <a href="Default.aspx">Try Again</a> </td> </tr> </table> <br /><br /> </body> </html>
<%@ Page Language="c#" CodeFile="error.aspx.cs" AutoEventWireup="True" Inherits="YAF.error" %> <html> <head> <title>Forum Error</title> <link type="text/css" rel="stylesheet" href="resources/forum.css" /> <link type="text/css" rel="stylesheet" href="themes/yafpro/theme.css" /> </head> <body> <div class="yafnet"> <table class="content" width="100%" cellspacing="1" cellpadding="0"> <tr> <td class="header1"> Forum Error</td> </tr> <tr> <td class="post" align="center" style="font-size:9pt;color:#990000;"> <br /> <asp:Label ID="ErrorMsg" Enabled="true" runat="server" /> <br /><br /> </td> </tr> <tr> <td class="footer1" align="center"> <a href="Default.aspx">Try Again</a> </td> </tr> </table> </div> </body> </html>
Add test page for the CompareValidator control.
<%@ Page Language="C#" %> <html> <script runat="server"> void Check_Click(Object src, EventArgs E) { message.Text = "Entered data is " + (Page.IsValid ? "valid." : "invalid!"); } </script> <head> <title>CompareValidator</title> </head> <body> <form runat="server"> <asp:Label text="Enter twice the same string:" runat="server"/><br> <asp:TextBox id="Text1" runat="server" /> == <asp:TextBox id="Text2" runat="server" /> <asp:CompareValidator runat="server" EnableClientScript="true" ControlToValidate="Text1" ControlToCompare="Text2" Operation="Equal" ErrorMessage="Strings do not match!"/><br /> <br /> <asp:Button text="Check" onclick="Check_Click" runat="server"/><br/ > <br /> <asp:Label id="message" runat="server"/> </form> </body> </html>
Fix for rendering bug... Div was no longer containing the subForums messing up theming.
<%@ Control Language="C#" AutoEventWireup="true" EnableViewState="false" CodeFile="ForumSubForumList.ascx.cs" Inherits="YAF.Controls.ForumSubForumList" %> <asp:Repeater ID="SubforumList" runat="server" OnItemCreated="SubforumList_ItemCreated"> <HeaderTemplate> <div class="subForumList"><span class="subForumTitle"><YAF:LocalizedLabel ID="SubForums" LocalizedTag="SUBFORUMS" runat="server" />:</span> </div> </HeaderTemplate> <ItemTemplate> <YAF:ThemeImage ID="ThemeSubforumIcon" runat="server" /> <%# GetForumLink((System.Data.DataRow)Container.DataItem) %></ItemTemplate> <SeparatorTemplate>, </SeparatorTemplate> <FooterTemplate> </FooterTemplate> </asp:Repeater>
<%@ Control Language="C#" AutoEventWireup="true" EnableViewState="false" CodeFile="ForumSubForumList.ascx.cs" Inherits="YAF.Controls.ForumSubForumList" %> <asp:Repeater ID="SubforumList" runat="server" OnItemCreated="SubforumList_ItemCreated"> <HeaderTemplate> <div class="subForumList"><span class="subForumTitle"><YAF:LocalizedLabel ID="SubForums" LocalizedTag="SUBFORUMS" runat="server" />:</span> </HeaderTemplate> <ItemTemplate> <YAF:ThemeImage ID="ThemeSubforumIcon" runat="server" /> <%# GetForumLink((System.Data.DataRow)Container.DataItem) %></ItemTemplate> <SeparatorTemplate>, </SeparatorTemplate> <FooterTemplate> </div> </FooterTemplate> </asp:Repeater>
Fix syntax error due to missing semicolon
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)) before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)); before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
Add a 2nd pointcut to handle files named "package.scala".
package scala.tools.eclipse.contribution.weaving.jdt.core; import org.eclipse.jdt.internal.core.util.Util; /** * We override the behaviour of isValidCompilationUnitName() for .scala files. * The standard implementation applies Java identifier rules on the prefix of * the file name, so that, for example, "package.scala" would not be judged * valid. See Issue #3266. */ @SuppressWarnings("restriction") public aspect CompilationUnitNameAspect { pointcut isValidCompilationUnitName(String name, String sourceLevel, String complianceLevel): args(name, sourceLevel, complianceLevel) && execution(boolean Util.isValidCompilationUnitName(String, String, String)); boolean around(String name, String sourceLevel, String complianceLevel): isValidCompilationUnitName(name, sourceLevel, complianceLevel) { if (name != null && name.endsWith(".scala")) return true; else return proceed(name, sourceLevel, complianceLevel); } }
package scala.tools.eclipse.contribution.weaving.jdt.core; import org.eclipse.jdt.internal.core.util.Util; import org.eclipse.jdt.core.JavaConventions; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.internal.core.JavaModelStatus; /** * We override the behaviour of isValidCompilationUnitName() for .scala files. * The standard implementation applies Java identifier rules on the prefix of * the file name, so that, for example, "package.scala" would not be judged * valid. See Issues #3266, #1000859. */ @SuppressWarnings("restriction") public aspect CompilationUnitNameAspect { private static boolean isScalaFileName(String name) { return name != null && name.length() > 6 && name.endsWith(".scala"); } pointcut isValidCompilationUnitName(String name, String sourceLevel, String complianceLevel): args(name, sourceLevel, complianceLevel) && execution(boolean Util.isValidCompilationUnitName(String, String, String)); boolean around(String name, String sourceLevel, String complianceLevel): isValidCompilationUnitName(name, sourceLevel, complianceLevel) { if (isScalaFileName(name)) return true; else return proceed(name, sourceLevel, complianceLevel); } pointcut validateCompilationUnitName(String name, String sourceLevel, String complianceLevel): args(name, sourceLevel, complianceLevel) && execution(IStatus JavaConventions.validateCompilationUnitName(String, String, String)); IStatus around(String name, String sourceLevel, String complianceLevel): validateCompilationUnitName(name, sourceLevel, complianceLevel) { if (isScalaFileName(name)) return JavaModelStatus.VERIFIED_OK; else return proceed(name, sourceLevel, complianceLevel); } }
Fix syntax error due to missing semicolon
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)) before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)); before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
Tweak X-Trace API call logging
package edu.brown.cs.systems.retro.aspects.cpu; import edu.brown.cs.systems.baggage.Baggage; import edu.brown.cs.systems.baggage.DetachedBaggage; import edu.brown.cs.systems.retro.resources.CPUTracking; import edu.brown.cs.systems.retro.resources.Execution; import edu.brown.cs.systems.retro.throttling.ThrottlingPoint; /** Intercepts X-Trace API calls in user code. Don't apply these pointcuts to the X-Trace library itself! * * @author jon */ public aspect XTraceAPICalls { before(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) { Execution.CPU.finished(thisJoinPointStaticPart); } after(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) || call(* Baggage.join(..)) { Execution.CPU.starting(thisJoinPointStaticPart); } /** Whenever the XTraceContext is cleared, log an event to indicate the end of CPU processing bounds */ before(): call(* Baggage.stop(..)) || call(* Baggage.discard(..)) { Execution.CPU.finished(thisJoinPointStaticPart); } before(): call(void ThrottlingPoint+.throttle()) { CPUTracking.finishTracking(); // finish and log current cycles } after(): call(void ThrottlingPoint+.throttle()) { CPUTracking.startTracking(); // start tracking cycles } }
package edu.brown.cs.systems.retro.aspects.cpu; import edu.brown.cs.systems.baggage.Baggage; import edu.brown.cs.systems.baggage.DetachedBaggage; import edu.brown.cs.systems.retro.resources.CPUTracking; import edu.brown.cs.systems.retro.resources.Execution; import edu.brown.cs.systems.retro.throttling.ThrottlingPoint; /** Intercepts X-Trace API calls in user code. Don't apply these pointcuts to the X-Trace library itself! * * @author jon */ public aspect XTraceAPICalls { before(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) { Execution.CPU.finished(thisJoinPointStaticPart); } after(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) { Execution.CPU.starting(thisJoinPointStaticPart); } /** Whenever the XTraceContext is cleared, log an event to indicate the end of CPU processing bounds */ before(): call(* Baggage.stop(..)) || call(* Baggage.discard(..)) { Execution.CPU.finished(thisJoinPointStaticPart); } before(): call(void ThrottlingPoint+.throttle()) { CPUTracking.finishTracking(); // finish and log current cycles } after(): call(void ThrottlingPoint+.throttle()) { CPUTracking.startTracking(); // start tracking cycles } }
Add compilation instructions for mirah-parser_with_duby.jar
import java.util.ArrayList; import java.util.List; import mirah.lang.ast.Node; import mirah.lang.ast.NodeScanner; import mirah.lang.ast.NodeImpl; class ChildCollector extends NodeScanner { private ArrayList<Node> children = new ArrayList<Node>(); @Override public boolean enterDefault(Node node, Object arg) { if (node == arg) { return true; } else { children.add(node); return false; } } @Override public Object enterNullChild(Object arg){ children.add(null); return null; } public ArrayList<Node> children() { return children; } } aspect DubyBootsrap { declare parents: Node extends duby.lang.compiler.Node; public List<Node> NodeImpl.child_nodes() { ChildCollector c = new ChildCollector(); c.scan(this, this); return c.children(); } }
import java.util.ArrayList; import java.util.List; import mirah.lang.ast.Node; import mirah.lang.ast.NodeScanner; import mirah.lang.ast.NodeImpl; /* To compile the new AST with duby extensions: * ajc -1.5 -inpath dist/mirah-parser.jar \ * -outjar dist/mirah-parser_with_duby.jar \ * -classpath ../mirah/javalib/mirah-bootstrap.jar:/Developer/aspectj1.6/lib/aspectjrt.jar \ * src/DubyBootstrap.aj */ class ChildCollector extends NodeScanner { private ArrayList<Node> children = new ArrayList<Node>(); @Override public boolean enterDefault(Node node, Object arg) { if (node == arg) { return true; } else { children.add(node); return false; } } @Override public Object enterNullChild(Object arg){ children.add(null); return null; } public ArrayList<Node> children() { return children; } } aspect DubyBootsrap { declare parents: Node extends duby.lang.compiler.Node; public List<Node> NodeImpl.child_nodes() { ChildCollector c = new ChildCollector(); c.scan(this, this); return c.children(); } }
Fix syntax error due to missing semicolon
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)) before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
package tlc2.tool.distributed; public aspect RMIMethodMonitorAspect { // catch all method calls to RMI methods pointcut callToRemoteMethod() : execution(* tlc2.tool.distributed.InternRMI.*(..)) || execution(* tlc2.tool.distributed.TLCServerRMI.*(..)) || execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..)) || execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..)); before(): (callToRemoteMethod()) { RMIMethodMonitor.entering(thisJoinPoint); } }
Remove annotation to remove java5 dependency
package org.lamport.tla.toolbox.test.threading; import org.aspectj.lang.annotation.SuppressAjWarnings; /** * The purpose of this advice is to intercept method execution in the backend * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util. * * It notifies the {@link MonitorAdaptor} about the method execution. */ public aspect MonitorAspect { public MonitorAspect() { MonitorAdaptor.setAspect(this); } // known places where backend call within UI thread are acceptable pointcut inFilter() : withincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String)); // catch all method calls (static and object ones) pointcut callToBackend() : execution(* tlc2..*.*(..)) || execution(* tla2sany..*.*(..)) || execution(* tla2tex..*.*(..)) || execution(* pcal..*.*(..)) || execution(* util..*.*(..)); // capture calls to backend, but not within ourself or in filter @SuppressAjWarnings before(): (callToBackend() && !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { MonitorAdaptor.enter(thisJoinPoint); } }
package org.lamport.tla.toolbox.test.threading; import org.aspectj.lang.annotation.SuppressAjWarnings; /** * The purpose of this advice is to intercept method execution in the backend * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util. * * It notifies the {@link MonitorAdaptor} about the method execution. */ public aspect MonitorAspect { public MonitorAspect() { MonitorAdaptor.setAspect(this); } // known places where backend call within UI thread are acceptable pointcut inFilter() : withincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String)); // catch all method calls (static and object ones) pointcut callToBackend() : execution(* tlc2..*.*(..)) || execution(* tla2sany..*.*(..)) || execution(* tla2tex..*.*(..)) || execution(* pcal..*.*(..)) || execution(* util..*.*(..)); // capture calls to backend, but not within ourself or in filter before(): (callToBackend() && !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { MonitorAdaptor.enter(thisJoinPoint); } }
Add aspect to check environment variables for Baggage from main method
package edu.brown.cs.systems.tracing.aspects; import edu.brown.cs.systems.baggage.BaggageUtils; /** * Instruments all main methods */ public aspect TracingPlaneInit { declare precedence: TracingPlaneInit, *; before(): execution(public static void main(String[])) { BaggageUtils.checkEnvironment(System.getenv()); } }
Change VOID into VOID * in function header
;------------------------------------------------------------------------------ ; ; Copyright (c) 2006, Intel Corporation ; All rights reserved. This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at ; http://opensource.org/licenses/bsd-license.php ; ; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ; ; Module Name: ; ; FlushCacheLine.Asm ; ; Abstract: ; ; AsmFlushCacheLine function ; ; Notes: ; ;------------------------------------------------------------------------------ .code ;------------------------------------------------------------------------------ ; VOID ; EFIAPI ; AsmFlushCacheLine ( ; IN VOID *LinearAddress ; ); ;------------------------------------------------------------------------------ AsmFlushCacheLine PROC clflush [rcx] mov rax, rcx ret AsmFlushCacheLine ENDP END
;------------------------------------------------------------------------------ ; ; Copyright (c) 2006, Intel Corporation ; All rights reserved. This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at ; http://opensource.org/licenses/bsd-license.php ; ; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, ; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ; ; Module Name: ; ; FlushCacheLine.Asm ; ; Abstract: ; ; AsmFlushCacheLine function ; ; Notes: ; ;------------------------------------------------------------------------------ .code ;------------------------------------------------------------------------------ ; VOID * ; EFIAPI ; AsmFlushCacheLine ( ; IN VOID *LinearAddress ; ); ;------------------------------------------------------------------------------ AsmFlushCacheLine PROC clflush [rcx] mov rax, rcx ret AsmFlushCacheLine ENDP END
Add linear search in x86 assembly lang
TITLE Linear/Sequential search implemented in x86 assembly (MASM) ; Search for a value in an array of bytes by comparing each value with a key ; return the position of the key ; O(n) time complexity ; the address of the first element in the array must be in the edx ; and the arrays length in the ecx register ; the index of the key is returned in the eax register .386 ; minimum CPU required to run the program .model flat, stdcall ; identifies the memory model for the program, ; in this case its protected mode. It also tells which ; calling convention to use for procedures .stack 4096 .data data db 42, 40, 70, 90, 62, 70, 40 ; our array of data .code ; implementation of sequential search SequentialSearch PROC xor eax, eax ; clear eax register just in case BEGIN_LOOP: cmp BYTE PTR[edx], bl ; if [edx] == bl je FOUND ; then goto FOUND inc eax ; else increment eax inc edx ; increment edx loop BEGIN_LOOP ; automatically decrements ecx register FOUND: ret SequentialSearch ENDP ; entry point main PROC mov bl, 90 ; search for 92 in array mov edx, OFFSET data mov ecx, LENGTHOF data call SequentialSearch main ENDP END main
Add patch to display popup when attempting to enter forest portrait
.nds .relativeinclude on .erroronwarning on ; This patch adds a text popup if the player tries to enter the Forest of Doom portrait before it's unlocked. ; This is necessary for portrait randomizer when the Forest of Doom portrait isn't in the normal location, since the normal event only works in that sector. @Overlay119Start equ 0x023C0000 @FreeSpace equ 0x023C0000 .open "ftc/arm9.bin", 02000000h .org 0x02079350 ; Location of code normally run when the Forest of Doom portrait is locked. (todo test if it affects other locked portraits) beq @FreeSpace .close .open "ftc/overlay9_119", @Overlay119Start .org @FreeSpace ldr r2,=20FC48Eh ; Bitfield of buttons pressed this frame. ldrh r2,[r2] ands r2,r2,40h ; Up. beq 20793FCh ; If up was not just pressed, continue on with the normal code without showing the message. ldr r0,=4BEh ; Load text index 4BE. Originally this is just an unused string ("The Lost Village") but this should be changed in the text editor to say: ; "You must beat Stella and talk to Wind\nto unlock the Forest of Doom." bl 2050544h ; Call ShowTextPopup. b 20793FCh ; Then continue on with the rest of the code. .pool .close
Add synchronization at the end of the copy test.
.regalias count s1 .regalias source s2 .regalias dest s3 .regalias temp s4 _start temp = 0xf cr30 = temp ; start all strands count = mem_l[length] source = &dataStart dest = source + count count = count >> 2 ; divide by 4 temp = cr0 ; get strand ID temp = temp * count ; compute offset source = source + temp ; compute source offset for this strand dest = dest + temp ; compute dest offset for this strand loop temp = mem_b[source] mem_b[dest] = temp source = source + 1 dest = dest + 1 count = count - 1 if count goto loop cr31 = s0 ; halt simulation length .word 2048 dataStart .word 0
.regalias count s1 .regalias source s2 .regalias dest s3 .regalias temp s4 _start temp = 0xf cr30 = temp ; start all strands count = mem_l[length] source = &dataStart dest = source + count count = count >> 2 ; divide by 4 temp = cr0 ; get strand ID temp = temp * count ; compute offset source = source + temp ; compute source offset for this strand dest = dest + temp ; compute dest offset for this strand loop temp = mem_b[source] mem_b[dest] = temp source = source + 1 dest = dest + 1 count = count - 1 if count goto loop ; Update number of finished strands s0 = &running_strands retry s1 = mem_sync[s0] s1 = s1 - 1 s2 = s1 mem_sync[s0] = s1 if !s1 goto retry wait_done if s2 goto wait_done ; Will fall through on last ref (s2 = 1) cr31 = s0 ; halt running_strands .word 4 length .word 2048 dataStart .word 0
Add experiment showing use of string as immediate value in source operand.
; Sandbox asm file template to start experimenting from SECTION .data SECTION .text global _start _start: nop mov eax,'WXYZ' ; You can use a string as an immediate value ; in a soure operand. Debugger will show 0x5A595857 ; which is the binary ascii equivalent. mov eax,1 ; Code for Exit Syscall mov ebx,0 ; Return a code of zero int 80H ; Make kernel call SECTION .bss
Add patch to fix infinite quest rewards bug in PoR
.nds .relativeinclude on .erroronwarning on .open "ftc/arm9.bin", 02000000h ; Disables the start button exiting the quests menu. ; The B button can be used to exit the quest menu instead. ; This prevents taking quest rewards over and over by exiting before the quest is marked as complete. ; Changes how the quest menu handles button presses. ; Normally the value at [r13,14h] being 2 means B was pressed, and 3 means start was pressed. ; When B is pressed on the quest list, it changes the value to 3 to simulate the player exiting with start. ; Instead we change it so 4 is the value needed to exit the menu, and make B pressed on the quest list set the value to 4 instead of 3. ; Start still just sets it to 3, which is now ignored. .org 0x02040848 cmp r0, 4h ; This is the value it must be to exit the quest menu. .org 0x0204041C moveq r0, 4h ; This is the value set when pressing B on the quest list. .org 0x0204083C movle r0, 4h ; This is the value set when the quest list is empty in some cases. .org 0x0204052C mov r0, 4h ; This is the value set when the quest list is empty in other cases. .close
Convert a string from uppercase to lowercase.
; Sandbox asm file template to start experimenting from ; converts the Snippet string in memory to lowercase by looping and ; adding 32 to each byte in the string SECTION .data Snippet db "KANGAROO" SECTION .text global _start _start: nop mov ebx,Snippet mov eax,8 DoMore: add byte [ebx],32 inc ebx dec eax jnz DoMore mov eax,1 ; Code for Exit Syscall mov ebx,0 ; Return a code of zero int 80H ; Make kernel call SECTION .bss
Add example asm files for testing
; Test program to bit-bang a single character out SOD as serial async data org 00000H BITTIME equ 0113h ; Time delay for a single bit OUTBITS equ 00Bh START: mvi c,'T' ; Send a test character COUT: di mvi b,OUTBITS ; Number of output bits xra a ; Clear carry for start bit CO1: mvi a,080H ; Set the SDE flag rar ; Shift carry into SOD flag cmc ; and invert carry. Why? (serial is inverted?) sim ; Output data bit lxi h,BITTIME ; Load the time delay for one bit width CO2: dcr l ; Wait for bit time jnz CO2 dcr h jnz CO2 stc ; Shift in stop bit(s) mov a,c ; Get char to send rar ; LSB into carry mov c,a ; Store rotated data dcr b jnz CO1 ; Send next bit ei lxi h,03fffH ; Wait a while before sending the character again CHILL: dcr l jnz CHILL dcr h jnz CHILL jmp START
Add tabs to sandbox template.
; Sandbox asm file template to start experimenting from SECTION .data SECTION .text global _start _start: nop mov eax,1 ; Code for Exit Syscall mov ebx,0 ; Return a code of zero int 80H ; Make kernel call SECTION .bss
; Sandbox asm file template to start experimenting from SECTION .data SECTION .text global _start _start: nop mov eax,1 ; Code for Exit Syscall mov ebx,0 ; Return a code of zero int 80H ; Make kernel call SECTION .bss
Add an 64-bit error function
; Copyright 2015 Philipp Oppermann ; ; 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. global long_mode_start extern main section .text bits 64 long_mode_start: ; call rust main call main ; print `OKAY` to screen mov rax, 0x2f592f412f4b2f4f mov qword [0xb8000], rax hlt
; Copyright 2015 Philipp Oppermann ; ; 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. global long_mode_start extern main section .text bits 64 long_mode_start: ; call rust main call main ; print `OKAY` to screen mov rax, 0x2f592f412f4b2f4f mov qword [0xb8000], rax hlt ; Prints `ERROR: ` and the given error code to screen and hangs. ; parameter: error code (in ascii) in al error: mov rbx, 0x4f4f4f524f524f45 mov [0xb8000], rbx mov rbx, 0x4f204f204f3a4f52 mov [0xb8008], rbx mov byte [0xb800e], al hlt
Add patch to make PoR enemy resistances behave like DoS and OoE
.nds .relativeinclude on .erroronwarning on ; This patch makes resistances in PoR act like resistances in DoS and OoE. ; In vanilla PoR, if an enemy resists even one element of an attack, it will resist the attack. ; This changes it so the enemy must resist all elements of the attack to resist the attack. .open "ftc/overlay9_0", 021CDF60h .org 0x021DA1F8 mvn r0, r5 ; Negate the bitfield of resistances. and r0, r0, r7 ; AND the attack's damage types with the negated resistances to find what elements were not resisted. ands r0, r0, 0FFh ; Only consider the first 8 resistances. Others have no effect. bne 021DA224h ; If any elements were not resisted, do not resist the attack. mov r0, r1, asr 1h ; Resisted, so halve the damage. (This was originally a float multiply by 0.5x, but we used up too much space so simplify it to a shift instead.) nop nop nop .close
Fix position of blackjack player plays
;;----------------------------------------------------------------------------;; ;; Align the position of the numbers in blackjack minigame of casino. ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm ;; Number of rounds played .org 0x02095FC0 ADD r1, r6, #0x00 + 0x1C ; X position
;;----------------------------------------------------------------------------;; ;; Align the position of the numbers in blackjack minigame of casino. ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm ;; Number of rounds played .org 0x02095FC0 ADD r1, r6, #0x00 + 0x12 ; X position
Fix bug when changing PoR starting area
.nds .relativeinclude on .erroronwarning on .open "ftc/arm9.bin", 02000000h .org 0x02051F90 ; Where the original game's code for loading area/sector/room indexes is. b 020BFC00h ; Jump to some free space, where we will put our own code for loading the area/sector/room indexes. .org 0x020BFC00 ; Free space. mov r5,0h ; Load the area index into r5. strb r5,[r0,515] ; Store the area index to the ram address where r0 will read it later. mov r5,0h ; Load the sector index into r5. mov r4,0h ; Load the room index into r4. b 02051F94h ; Return to where we came from. .close
.nds .relativeinclude on .erroronwarning on .open "ftc/arm9.bin", 02000000h .org 0x02051F90 ; Where the original game's code for loading area/sector/room indexes is. b 020BFC00h ; Jump to some free space, where we will put our own code for loading the area/sector/room indexes. .org 0x020BFC00 ; Free space. mov r5,0h ; Load the area index into r5. strb r5,[r0,515h] ; Store the area index to the ram address where r0 will read it later. (0x02111785) mov r5,0h ; Load the sector index into r5. mov r4,0h ; Load the room index into r4. b 02051F94h ; Return to where we came from. .close
Fix error with root directory entry for STAGE2.BIN
; Volume Label db 'BOOTDISK' ; File Name db ' ' ; File Extension db 0x08 ; Attribute db 0x00 ; Reserved for NT db 0x01 ; Creation dw 0x0000 ; Creation Time dw 0x0000 ; Creation Date dw 0x0000 ; Last Access Data dw 0x0000 ; FAT32 Upper Half dw 0x8000 ; Last Write Time dw 0x475F ; Last Write Date dw 0x0000 ; Starting Cluster dd 0x00000000 ; File Size ; Second-Stage File db 'STAGE2 ' ; File Name db 'BIN' ; File Extension db 0x05 ; Attribute (Read-only: 1; System: 4) db 0x00 ; Reserved for NT db 0x01 ; Creation dw 0x0000 ; Creation Time dw 0x0000 ; Creation Date dw 0x0000 ; Last Access Data dw 0x0000 ; FAT32 Upper Half dw 0x8000 ; Last Write Time dw 0x475F ; Last Write Date dw 0x0000 ; Starting Cluster dd 0x00000200 ; File Size pad: times (14*512)-($-$$) db 0
; Volume Label db 'BOOTDISK' ; File Name db ' ' ; File Extension db 0x08 ; Attribute db 0x00 ; Reserved for NT db 0x01 ; Creation dw 0x0000 ; Creation Time dw 0x0000 ; Creation Date dw 0x0000 ; Last Access Data dw 0x0000 ; FAT32 Upper Half dw 0x8000 ; Last Write Time dw 0x475F ; Last Write Date dw 0x0000 ; Starting Cluster dd 0x00000000 ; File Size ; Second-Stage File db 'STAGE2 ' ; File Name db 'BIN' ; File Extension db 0x05 ; Attribute (Read-only: 1; System: 4) db 0x00 ; Reserved for NT db 0x01 ; Creation dw 0x0000 ; Creation Time dw 0x0000 ; Creation Date dw 0x0000 ; Last Access Data dw 0x0000 ; FAT32 Upper Half dw 0x8000 ; Last Write Time dw 0x475F ; Last Write Date dw 0x0002 ; Starting Cluster dd 0x00000200 ; File Size pad: times (14*512)-($-$$) db 0
Add patch to enable skipping AoS cutscenes on first playthrough
.gba .relativeinclude on .erroronwarning on .open "ftc/rom.gba", 08000000h ; Allow skipping events with start, even if you haven't beaten the game once yet. .org 0x0805B56C mov r0, 3h .close
Add flash on Z cancel demo
// Super Smash Bros. flash on Z cancel demonstration arch n64.cpu endian msb //output "", create include "LIB\N64.inc" include "LIB\macros.inc" origin 0x0 insert "LIB\Super Smash Bros. (U) [!].z64" origin 0x0CB528 base 0x80150AE8 // Z cancel jal Flash origin 0x33204 base 0x80032604 scope Flash: { addiu sp, -0x18 sw ra, 0x14 (sp) jal 0x80142D9C // Original instruction sw v1, 0x10 (sp) // Save v1 lw v1, 0x10 (sp) // Restore v1 lw t0, 0x0160 (v1) slti t1, t0, 0x000B beqz t1, End // If within frame window nop Flash: lw a0, 0x04 (v1) // Pointer //lli a1, 0x08 // Sparkle lli a1, 0x2B // Yellow jal 0x800E9814 // Flash or a2, r0, r0 End: lw ra, 0x14 (sp) jr ra addiu sp, 0x18 }
Add patch to fix bug where common enemy creature sets boss death flag
.nds .relativeinclude on .erroronwarning on ; This patch fixes the bug where the common enemy version of The Creature sets his boss death flag. .open "ftc/overlay9_60", 022D7900h .org 0x022D7D14 ; Check if Var A is 0 (common enemy/boss rush version) and skip setting the boss death flag if so. ; This code already existed around here in vanilla, we're just moving it up a few lines to before setting the boss death flag instead of after. ldrh r1, [r1, 3Ch] cmp r1, 0h beq 0x022D7D30 ; Then set the boss death flag. ldr r2, [r0, 76Ch] orr r2, r2, 200h str r2, [r0, 76Ch] .close
Add routine for 32bit print.
; ============================================================================= ; Copyright (C) 2015 Manolis Fragkiskos Ragkousis -- see LICENSE.TXT ; ============================================================================= ;;; Print routine ;;; ebx contains a null terminated string %ifndef PRINT_STRING_PM %define PRINT_STRING_PM [bits 32] VIDEO_MEMORY equ 0xb8000 WHITE_ON_BLACK equ 0x0f print_string_pm: pusha mov edx, VIDEO_MEMORY print_string_pm_loop: mov al, [ebx] mov ah, WHITE_ON_BLACK cmp al, 0 je print_string_pm_done mov [edx], ax add ebx, 1 add edx, 2 jmp print_string_pm_loop print_string_pm_done: popa ret %endif
Add patch to make Balore face left if player enters from left
.nds .relativeinclude on .erroronwarning on ; This patch makes Balore detect which side of the room the player enters from, and if it's from the left, he moves himself to face left. .open "ftc/overlay9_23", 022FF9C0h @Overlay41Start equ 0x02308920 @FreeSpace equ @Overlay41Start + 0x140 .org 0x022FFD44 b @BaloreFacePlayer .close .open "ftc/overlay9_41", @Overlay41Start .org @FreeSpace @BaloreFacePlayer: mov r0, r5 bl 021C3278h ; GetPlayerXPos cmp r0, 80000h ; X pos 0x80, halfway through the leftmost screen bge @BaloreFaceRight @BaloreFaceLeft: mov r0, 0h ; Var A mov r1, 0F0000h ; X pos str r1, [r5, 2Ch] b @BaloreFacePlayerEnd @BaloreFaceRight: mov r0, 1h ; Var A ; We don't set X pos here because we assume Balore's X pos was already properly set for facing right. @BaloreFacePlayerEnd: ; Go back to Balore's normal code to set the direction he faces ; We make sure r0 has Var A in it - but not Balore's real Var A, just the one to check for the purposes of deciding the direction he faces. b 0x022FFD48 .close
Move level number in equip menu
;;----------------------------------------------------------------------------;; ;; Align the position of the textbox in equip menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; Item name .arm .org 0x020821B8 MOV r1, #0x83 ; X pos, originally 0x84 ;; Item quantity .arm .org 0x02082228 MOV r1, #0xDB ; X pos, originally 0xDD
;;----------------------------------------------------------------------------;; ;; Align the position of the textbox in equip menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; Item name .arm .org 0x020821B8 MOV r1, #0x83 ; X pos, originally 0x84 ;; Item quantity .arm .org 0x02082228 MOV r1, #0xDB ; X pos, originally 0xDD ;; Level .arm .org 0x2080544 MOV r1, #0x79 + 2 ; X poss
Modify version string to be more concise
; 0x0000 ; RST 0x00 jp boot ; Magic Number ; 0x0003 .db "KK" ; 0x0008 ; RST 0x08 .fill 0x08-$ rkcall: jp kcall .fill 0x10-$ ; 0x0010 ; RST 0x10 rlcall: jp lcall .fill 0x18-$ ; 0x0018 ; RST 0x18 jp reboot .fill 0x20-$ ; 0x0020 ; RST 0x20 jp pcall .fill 0x28-$ ; 0x0028 ; RST 0x28 jp bcall .fill 0x30-$ ; 0x0030 ; RST 0x30 ret .fill 0x38-$ ; 0x0038 ; RST 0x38 ; SYSTEM INTERRUPT jp sysInterrupt ; 0x003B .fill 0x53-$ ; 0x0053 jp boot ; 0x0056 .db 0xFF, 0xA5, 0xFF .fill 0x64-$ .exec git describe --dirty ; Version string .db 0
; 0x0000 ; RST 0x00 jp boot ; Magic Number ; 0x0003 .db "KK" ; 0x0008 ; RST 0x08 .fill 0x08-$ rkcall: jp kcall .fill 0x10-$ ; 0x0010 ; RST 0x10 rlcall: jp lcall .fill 0x18-$ ; 0x0018 ; RST 0x18 jp reboot .fill 0x20-$ ; 0x0020 ; RST 0x20 jp pcall .fill 0x28-$ ; 0x0028 ; RST 0x28 jp bcall .fill 0x30-$ ; 0x0030 ; RST 0x30 ret .fill 0x38-$ ; 0x0038 ; RST 0x38 ; SYSTEM INTERRUPT jp sysInterrupt ; 0x003B .fill 0x53-$ ; 0x0053 jp boot ; 0x0056 .db 0xFF, 0xA5, 0xFF .fill 0x64-$ .exec git describe --dirty=+ ; Version string .db 0
Add patch to skip emblem drawing screen in PoR
.nds .relativeinclude on .erroronwarning on .open "ftc/overlay9_25", 022D7900h ; Skip the screen where the player has to draw an emblem and press OK when starting a new game. .org 0x022DAAB0 ; Code in the name entry menu after you finished typing in your name that would normally take you to the emblem drawing screen next. mov r11, 19h ; We set the return value to 0x19, which is the state for the scrolling prologue introduction. nop nop nop nop nop nop .close
Add patch to fix Gravedorcus from left entrance
.nds .relativeinclude on .erroronwarning on ; This patch makes Gravedorcus not immediately damage the player if they enter from the left door. .open "ftc/overlay9_33", 022B73A0h .org 0x022BA230 ; Remove branch that would make Gravedorcus's intro cutscene play if you enter the room from the right. nop .org 0x022BA250 .area 0x20 ; Lines 022BA258-022BA26C were for the cutscene we skipped over, so we get 0x18 extra bytes to work with from that. ; Set Gravedorcus's state to 5 instead of 1. ; This causes Gravedorcus to start at X position 0x100 and shooting projectiles to the left, which is dodgeable, while spawning right on top of the player and moving to the right is not dodgeable. mov r0, 5h strb r0, [r5, 0Dh] ; Replace the two lines we overwrote at the start (return) add r13, r13, 10h pop r3-r5,r15 .endarea .close
Move up the number of military games
;;----------------------------------------------------------------------------;; ;; Align the position of the numbers in military minigame of casino. ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm .org 0x0207E900 MOV r1, #0xB+19 ; X pos MOV R2, #3 ; Y pos
;;----------------------------------------------------------------------------;; ;; Align the position of the numbers in military minigame of casino. ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm .org 0x0207E900 MOV r1, #0xB+19 ; X pos MOV R2, #2 ; Y pos
Add patch to always enable dowsing hat effect
.nds .relativeinclude on .erroronwarning on ; Always have the Dowsing Hat effect of beeping when there's a hidden blue chest, even if you don't have Dowsing Hat equipped. .open "ftc/overlay9_19", 021FFFC0h .org 0x0221AE30 ; Where the blue chest loads your currently equipped head armor. mov r0, 7h ; Dowsing Hat .close
Add asm patch to implement magical tickets in DoS
.nds .relativeinclude on .erroronwarning on @Overlay41Start equ 0x023E0100 @FreeSpace equ 0x023E0100 .open "ftc/overlay9_0", 0219E3E0h .org 0x021EEF00 b @FreeSpace .close .open "ftc/overlay9_41", @Overlay41Start .org @FreeSpace ; TODO: Don't allow using during boss fights. mov r0, 0h ; Sector index mov r1, 1h ; Room index mov r2, 80h ; X pos mov r3, 60h ; Y pos bl 02026AD0h ; SetDestinationRoomSectorAndRoomIndexes ldr r1, =020F6DF4h mov r0, 6h strb r0, [r1] ; We set the current type of transition mode (020F6DF4) to 6, meaning a warp of some kind. mov r0, 0h strb r0, [r1,1h] ; Enable control of the player, in case they were using the slide puzzle and controls were disabled. bl 021F64BCh ; Below is copy pasted, it triggers the game to unpause. mov r0,44h bl 2029BF0h mov r0,0h mvn r1,0Fh mov r2,8h bl 20080DCh mov r2,3h ldr r0,=208AC20h strb r2,[r9,0Dh] ldr r1,[r0] ldrb r0,[r1,8h] cmp r0,17h strneb r2,[r1,0Ah] ; Above is copy pasted, it triggers the game to unpause mov r4, 42h ; This tells the rest of the consumable code to use one of the consumable, and play the consumable-used SFX. b 0x021EF0F8 ; Return to the consumable code. ; Alternate code to not use one of the tickets up: ; mov r0, 42h ; This is the SFX that will be played. ; b 0x021EF264 ; Return to the consumable code. .pool .close
Add patch to fix some PoR bosses not playing music in boss rando
.nds .relativeinclude on .erroronwarning on ; Fixes the boss rush versions of certain bosses so they play the boss music when they're created. ; This is for the boss randomizer. @Overlay119Start equ 0x02308EC0 @FreeSpace equ @Overlay119Start + 0x4C0 .open "ftc/overlay9_119", @Overlay119Start .org @FreeSpace @InitializeEnemyAndOverridePlayBossMusic: push r14 push r1 ; Preserve the music ID bl 021D9184h ; InitializeEnemyFromDNA (replaces the line we overwrote to call this custom function) pop r0 ; Get the music ID out of the stack bl 0204D374h ; PlaySongWithVariableUpdatesExceptInBossRush ; Set bit to make the song that was set override the BGM. ldr r0, =0211174Ch ldr r1, [r0] orr r1, r1, 00040000h str r1, [r0] pop r15 @InitializeEnemyAndOverridePlayBossMusicForLegion: push r14 mov r1, 12h ; Music ID for Destroyer bl @InitializeEnemyAndOverridePlayBossMusic pop r15 .pool .close .open "ftc/overlay9_52", 022D7900h ; Legion .org 0x022D7A24 bl @InitializeEnemyAndOverridePlayBossMusicForLegion .close .open "ftc/overlay9_64", 022D7900h ; Death .org 0x022D7BD0 ; This line usually prevented the code for starting the boss music from running in Jonathan mode. ; Just remove it. nop .close .open "ftc/overlay9_63", 022D7900h ; Stella .org 0x022D7A4C ; This line usually prevented the code for starting the boss music from running in Jonathan mode. ; Just remove it. nop .close
Fix Windows compileation for VS 2010
.386 .model flat exception_handler proto .safeseh exception_handler end
.386 .model flat exception_handler proto c .safeseh exception_handler end
Remove unused sentinel table for i686
; This file is a part of the IncludeOS unikernel - www.includeos.org ; ; Copyright 2015 Oslo and Akershus University College of Applied Sciences ; and Alfred Bratterud ; ; 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. global __arch_start:function extern kernel_start [BITS 32] ;; @param: eax - multiboot magic ;; @param: ebx - multiboot bootinfo addr __arch_start: ;; Create stack frame for backtrace push ebp mov ebp, esp ;; hack to avoid stack protector mov DWORD [0x1014], 0x89abcdef ;; Push params on 16-byte aligned stack sub esp, 8 and esp, -16 mov [esp], eax mov [esp+4], ebx call kernel_start ;; Restore stack frame mov esp, ebp pop ebp ret sentinel_table: dd sentinel_table ;; 0x0 dd 0 ;; 0x8 dd 0 ;; 0x10 dd 0 ;; 0x18 dd 0 ;; 0x20 dd 0x123456789ABCDEF
; This file is a part of the IncludeOS unikernel - www.includeos.org ; ; Copyright 2015 Oslo and Akershus University College of Applied Sciences ; and Alfred Bratterud ; ; 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. global __arch_start:function extern kernel_start [BITS 32] ;; @param: eax - multiboot magic ;; @param: ebx - multiboot bootinfo addr __arch_start: ;; Create stack frame for backtrace push ebp mov ebp, esp ;; hack to avoid stack protector mov DWORD [0x1014], 0x89abcdef ;; Push params on 16-byte aligned stack sub esp, 8 and esp, -16 mov [esp], eax mov [esp+4], ebx call kernel_start ;; Restore stack frame mov esp, ebp pop ebp ret
Test source update to test both gl> and gs>
\ This software is the Kestrel-3's first milestone: print a bunch of "A" \ characters to the console. $2000 ORG ( RISC-V ISA spec says we boot here. ) 0 x31 auipc ( X31 = address of next insn ) assume-gp ( This lets us load big constants ) x31 gl> uart-port x2 ld ( X2 = uart transmit port ) x0 65 x3 addi ( X3 = ASCII code for "A" ) -> .again x3 x2 0 sb ( send "A" to console ) .again x0 jal ( repeat forever ) -> uart-port $0F000000.00000000 D,
\ This software is the Kestrel-3's first milestone: print a bunch of "A" \ characters to the console. $2000 ORG ( RISC-V ISA spec says we boot here. ) 0 x31 auipc ( X31 = address of next insn ) assume-gp ( This lets us load big constants ) x31 gl> uart-port x2 ld ( X2 = uart transmit port ) x0 65 x3 addi ( X3 = ASCII code for "A" ) -> .again x3 x2 0 sb ( send "A" to console ) x31 gl> .ctr x4 ld ( count how many "A"s we send ) x4 1 x4 addi x4 x31 gs> .ctr sd .again x0 jal ( repeat forever ) -> uart-port $0F000000.00000000 D, -> .ctr 0.0 D,
Fix the bold effect for stamps in request menu
;;----------------------------------------------------------------------------;; ;; Increase textbox size in request menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; # REQUEST TITLE # .arm .org 020C5804h MOV r1, #0x49 ; X Position: original 0x50 MOV r2, #4 ; Y Position: original 0x03 ;; # STAMP GIVEN # .org 020C5950h MOV r1, #0xCD + 10 ; X position
;;----------------------------------------------------------------------------;; ;; Increase textbox size in request menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; # REQUEST TITLE # .arm .org 020C5804h MOV r1, #0x49 ; X Position: original 0x50 MOV r2, #4 ; Y Position: original 0x03 ;; # STAMP GIVEN # .org 020C5950h MOV r1, #0xCD + 10 ; X position .org 020C5968h MOV r1, #0xCE + 10 ; X position (to paint twice - bold effect)
Add call for load_gdt, but disabled because it triple faults
# multiboot config and setup .set ALIGN, 1<<0 # align modules on page boundaries .set MEMINFO, 1<<1 # provide memory map .set FLAGS, ALIGN | MEMINFO # flags .set MAGIC, 0x1BADB002 # header magic .set CHECKSUM, -(MAGIC + FLAGS) # checksum to prove multi .section .multiboot .align 4 .long MAGIC .long FLAGS .long CHECKSUM # configure early stack (to be replaced once gdt loaded) .section .stack, "aw", @nobits stack_bottom: .skip 16384 stack_top: .section .text .extern entry .global _start .type _start, @function _start: mov $stack_top,%esp call entry _stop: cli 1: hlt jmp 1b .size _start, . - _start
# multiboot config and setup .set ALIGN, 1 << 0 # align modules on page boundaries .set MEMINFO, 1 << 1 # provide memory map .set FLAGS, ALIGN | MEMINFO # flags .set MAGIC, 0x1BADB002 # header magic .set CHECKSUM, -(MAGIC + FLAGS) # checksum to prove multi .section .multiboot .align 4 .long MAGIC .long FLAGS .long CHECKSUM # configure early stack (to be replaced once gdt loaded) .section .stack, "aw", @nobits stack_bottom: .skip 16384 stack_top: .section .text .extern entry .extern load_gdt .global _start .type _start, @function _start: movl $stack_top,%esp #call load_gdt call entry cli halt: hlt jmp halt .size _start, . - _start
Add patch to keep DoS drawbridge down once lowered
.nds .relativeinclude on .erroronwarning on ; This patch makes the drawbridge in DoS stay down permanently once you've lowered it once. ; The button will stay depressed, so that you don't need to worry about hitting it every time you walk into the room from the right. .open "ftc/overlay9_0", 0219E3E0h .org 0x021A27C8 ; When Soma walks/jumps off the button after pressing it, this line would normally re-raise the button. nop ; Remove it so the button doesn't instantly come up. .org 0x021A2260 ; This line runs when the drawbridge is created, if the drawbridge has already been lowered previously. ; Originally this line was doing something useless, storing 0 to a value which is just 0 by default anyway. So we can replace it. strb r3, [r4, 5h] ; Store 1 to the button's "pressed" state so the player can't press it again. .close
Add completely untested multitasking code
taskswapHandler : pop ecx ; pop eip into ecx pusha mov ebx, [currentTaskNum] ; get the current task imul ebx, TASK_OBJ_SIZE add ebx, RunningTaskList mov [ebx+Task_eip], ecx mov [ebx+Task_stackLoc], esp ; store the relevent things ; get the next Task object into ebx taskswapHandler.goLoop : add ebx, TASK_OBJ_SIZE cmp ebx, RunningTaskListEnd jge taskswapHandler.doneZeroing mov ebx, RunningTaskList taskswapHandler.doneZeroing : cmp dword [ebx+Task_id], 0 je taskswapHandler.goLoop taskswapHandler.noloopback : mov esp, [ebx+Task_stackLoc] popa push dword [ebx+Task_eip] iret currentTaskNum : dd 0x0 RunningTaskList : times 32*TASK_OBJ_SIZE db 0x0 ; 32 tasks max atm RunningTaskListEnd : Task_id equ 0x0 Task_stackLoc equ 0x4 Task_eip equ 0x8 TASK_OBJ_SIZE equ 0xC registerTask : ; eip in ecx pusha mov ebx, RunningTaskList registerTask.loop : cmp dword [ebx+Task_id], 0 je registerTask.foundTask add ebx, TASK_OBJ_SIZE jmp registerTask.loop registerTask.foundTask : mov eax, [currentTaskId] mov [ebx+Task_id], eax mov [ebx+Task_eip], ecx add eax, 1 mov [currentTaskId], eax mov edx, ebx sub eax, 1 mov ebx, TASK_STACK_SIZE call Guppy.malloc add ebx, TASK_STACK_SIZE*0x200 mov [edx+Task_stackLoc], ebx popa ret unregisterTask : ; ID in ecx pusha mov ebx, RunningTaskList unregisterTask.loop : cmp dword [ebx+Task_id], ecx je unregisterTask.foundTask unregisterTask.foundTask : xor ecx, ecx mov [ebx+Task_id], ecx popa ret currentTaskId : dd 0x0 TASK_STACK_SIZE equ 2
Set global GOT at 0 and merge infinite loops
use32 global _GLOBAL_OFFSET_TABLE_ global __morestack global abort global memcmp global memcpy global malloc global free global start extern main start: ; rust functions compare esp against [gs:0x30] as a sort of stack guard thing ; as long as we set [gs:0x30] to dword 0, it should be ok mov [gs:0x30], dword 0 ; clear the screen a slightly different colour mov edi, 0xb8000 mov ecx, 80*25*2 mov al, 1 rep stosb ; jump into rust call main jmp $ _GLOBAL_OFFSET_TABLE_: __morestack: abort: jmp $ memcmp: jmp $ memcpy: jmp $ malloc: jmp $ free: jmp $
use32 global __morestack global abort global memcmp global memcpy global malloc global free global start global _GLOBAL_OFFSET_TABLE_ _GLOBAL_OFFSET_TABLE_ equ 0 extern main start: ; rust functions compare esp against [gs:0x30] as a sort of stack guard thing ; as long as we set [gs:0x30] to dword 0, it should be ok mov [gs:0x30], dword 0 ; clear the screen a slightly different colour mov edi, 0xb8000 mov ecx, 80*25*2 mov al, 1 rep stosb ; jump into rust call main abort: __morestack: memcmp: memcpy: malloc: free: jmp $
Add optimistic disk loading code to get the map into 000
BasicUpstart2(start) * = $0810 "Main" start: rts
BasicUpstart2(start) * = $0810 "Main" start: jsr loadmap rts loadmap: lda #fname_end-fname ldx #<fname ldy #>fname jsr $FFBD //; call SETNAM lda #$01 ldx $BA //#; last used dev number bne skip ldx #$08 //; default to device 8 skip: ldy #$00 //; $00 means: load to new address jsr $FFBA //; call SETLFS ldx #<$1000 ldy #>$1000 lda #$00 //; $00 means: load to memory (not verify) jsr $FFD5 //; call LOAD bcs error //; if carry set, a load error has happened rts error: // ; Accumulator contains BASIC error code // ; most likely errors: // ; A = $05 (DEVICE NOT PRESENT) // ; A = $04 (FILE NOT FOUND) // ; A = $1D (LOAD ERROR) // ; A = $00 (BREAK, RUN/STOP has been pressed during loading) // ... error handling ... sta $d020 rts fname: .text "MAP1A" fname_end: * = $1000 "map data section" map: .fill 1000,0 mapend:
Check the state->st_b.condition when returining from the interpreter
%include "Ab/State.nasm" extern ab_act global ab_interpret_func section .text ab_interpret_func: call ab_act ret
%include "Ab/State.nasm" extern ab_act global ab_interpret_func section .text ; Byte* ab_interpret_func(ExecState*, ExecAction) ab_interpret_func: push rbx mov rbx, rdi call ab_act cmp byte [rbx + ExecState.st_b + ExecStateB.condition], ExecCond_HALTED je ab_exit int 3 ab_exit: pop rbx ret
Add test for fsave and frstor
global _start section .data align 16 %include "header.inc" sub esp, 128 fldz fld1 fsave [esp] frstor [esp] %include "footer.inc"
Add proof of concept file for using assembler macros instead of instructions.
ο»Ώ.cpu "6502" .format "flat" * = $F000 BackgroundColor = $80 INT_Byte_SIZE = 1 VSYNC = $00 VBLANK = $01 WSYNC = $02 COLUBK = $09 TIM64T = $296 INTIM = $284 push .macro address, size .for i = \address, i <= \address + (\size - 1), i = i + 1 LDA i PHA .next .endmacro popTo .macro address, size .for i = \address + (\size - 1), i >= \address, i = i - 1 PLA STA i .next .endmacro // Can replace a consecutive ".push(...) .popTo(...)" as an optimization. // Copies directly between 2 addresses without using PHA/PLA copyTo .macro fromAddress, toAddress, size .for i = 0, i < \size, i = i + 1 .let source = \fromAddress + i .let destination = \toAddress + i LDA source STA destination .next .endmacro Start SEI CLD LDX #$FF TXS LDA #0 ClearMem STA 0,X DEX BNE ClearMem MainLoop LDA #%00000010 STA VSYNC STA WSYNC STA WSYNC STA WSYNC LDA #43 STA TIM64T LDA #0 STA VSYNC INC BackgroundColor //.push BackgroundColor, INT_Byte_SIZE //.popTo COLUBK, INT_Byte_SIZE // Compiler should optimize above to: .copyTo BackgroundColor, COLUBK, INT_Byte_SIZE WaitForVBlankEnd LDA INTIM BNE WaitForVBlankEnd STA WSYNC STA VBLANK LDY #192 ScanLoop STA WSYNC DEY BNE ScanLoop LDA #2 STA WSYNC STA VBLANK LDY #30 OverScanWait STA WSYNC DEY BNE OverScanWait JMP MainLoop // Special memory locations. Tells the 6502 where to go. * = $FFFC .word Start .word Start
Move stamp gives in request menu
;;----------------------------------------------------------------------------;; ;; Increase textbox size in request menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; # REQUEST TITLE # .arm .org 020C5804h MOV r1, #0x49 ; X Position: original 0x50 MOV r2, #4 ; Y Position: original 0x03
;;----------------------------------------------------------------------------;; ;; Increase textbox size in request menu ;; Copyright 2014 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; ;; # REQUEST TITLE # .arm .org 020C5804h MOV r1, #0x49 ; X Position: original 0x50 MOV r2, #4 ; Y Position: original 0x03 ;; # STAMP GIVEN # .org 020C5950h MOV r1, #0xCD + 10 ; X position
Tweak to skip name signing patch
.nds .relativeinclude on .erroronwarning on .open "ftc/arm9.bin", 02000000h ; Skip the screen where the player has to sign their name and press OK when starting a new game. .org 0x02045E8C ; Code that sets the name signing menu's state to 3 after zeroing out the name pixel data. movne r0, 6h ; Instead set the state to 6, meaning the state where the player has pressed OK and the new game is now starting. .close
.nds .relativeinclude on .erroronwarning on .open "ftc/arm9.bin", 02000000h ; Skip the screen where the player has to sign their name and press OK when starting a new game. .org 0x02045E8C ; Code that sets the name signing menu's state to 3 after zeroing out the name pixel data. movne r0, 6h ; Instead set the state to 6, meaning the state where the player has pressed OK and the new game is now starting. .org 0x02045E78 ; Code that displays the name signing menu on the screen. nop ; Delete it to prevent the name signing screen from being visible for a split second when starting a new game. .close
Print additional info about SID file
// load sid music .var music = LoadSid("res/jeff_donald.sid") //.var music = LoadSid("res/demo.sid") .pc = music.location .fill music.size, music.getData(i) .var picture = LoadBinary("res/dcc.prg") .pc = $2000 - 2 "Bitmap Data" .fill picture.getSize(), picture.get(i)
// load sid music //.var music = LoadSid("res/jeff_donald.sid") .var music = LoadSid("res/demo.sid") .pc = music.location "Music" .fill music.size, music.getData(i) .pc = $2000 - 2 "Bitmap Data" .var picture = LoadBinary("res/dcc.prg") .fill picture.getSize(), picture.get(i) //---------------------------------------------------------- // Print the music info while assembling .print "" .print "SID Data" .print "--------" .print "location=$"+toHexString(music.location) .print "init=$"+toHexString(music.init) .print "play=$"+toHexString(music.play) .print "songs="+music.songs .print "startSong="+music.startSong .print "size=$"+toHexString(music.size) .print "name="+music.name .print "author="+music.author .print "copyright="+music.copyright .print "" .print "Additional tech data" .print "--------------------" .print "header="+music.header .print "header version="+music.version .print "flags="+toBinaryString(music.flags) .print "speed="+toBinaryString(music.speed) .print "startpage="+music.startpage .print "pagelength="+music.pagelength
Fix bug in dos seal drawing skip patch
.nds .relativeinclude on .erroronwarning on .open "ftc/overlay9_0", 0219E3E0h ; This makes it so you don't need to draw a Magic Seal to kill a boss. .org 0x02213C04 ; Location of the boss-killed code for loading the current game mode. mov r0, 1 ; Always load 1 (meaning Julius mode). .close
.nds .relativeinclude on .erroronwarning on .open "ftc/overlay9_0", 0219E3E0h ; This patch makes it so you don't need to draw a Magic Seal to kill a boss. .org 0x02213C04 ; Location of the seal drawing code for loading the current game mode. mov r0, 1 ; Always load 1 (meaning Julius mode). ; The above change causes a bug with the practice seal menu, where attempting to practice a seal will cause the screen to go black and the game to softlock. .org 0x021F1BF8 ; Location of code in the practice menu to decide which type of seal to do. mov r1, 0 ; Instead of setting argument r1 to 2 (meaning a practice seal) we set it to 0 (meaning an automatically drawn example seal). This doesn't softlock the game. .close
Make SYS call to label main, not the end of the BASIC program.
org $0fff load_address: $01 $10 @(low basic_end) @(high basic_end) $01 $00 $9e "4109" 0 basic_end: $00 $00
org $0fff load_address: $01 $10 @(low basic_end) @(high basic_end) $01 $00 $9e @(princ main nil) 0 basic_end: $00 $00
Move technique name and PM in team menu
;;----------------------------------------------------------------------------;; ;; Align the position of the textbox in team menu ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm ;; Character face icon .org 0x02130478 ADD R2, R2, #0x19 - 1 ; Y position ;; Health state .org 0x02130A08 MOV R2, #0x2A + 1 ; Y position
;;----------------------------------------------------------------------------;; ;; Align the position of the textbox in team menu ;; Copyright 2015 Benito Palacios (aka pleonex) ;; ;; 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. ;;----------------------------------------------------------------------------;; .arm ;; Character face icon .org 0x02130478 ADD R2, R2, #0x19 - 1 ; Y position ;; Health state .org 0x02130A08 MOV R2, #0x2A + 1 ; Y position ;; Technique name .org 0x021311AC MOV R2, #7 - 3 ; Y position ;; Technique magic .org 0x021311EC MOV R2, #8 - 2 ; Y position
Add patch to make gergoth not be on top of player coming from left
.nds .relativeinclude on .erroronwarning on ; This patch makes Gergoth appear on the right half of his room when the player enters from the left so he's not on top of the player. .open "ftc/overlay9_36", 022FF9C0h .org 0x022FFAF0 ; Code in Gergoth's initialization that normally floors him in different ways depending on his var A. ; First we simplify the flooring code (to make room for new code) by always doing the same thing instead of having 4 different possibilities for 4 different var As. mov r0, 0B0000h str r0, [r5, 30h] ; Set Gergoth's Y pos to 0xB0. ldr r0, =020CA95Ch ldr r0, [r0] ; Load player's X pos. cmp r0, 80000h ; Check if player came in on the left half of the room. movlt r0, 0C0000h strlt r0, [r5, 2Ch] ; Move Gergoth's X pos to 0xC0, close to the right wall. b 022FFB48h .pool .close
Add patch to start Julius with the Tower Key
.nds .relativeinclude on .erroronwarning on .open "ftc/overlay9_0", 0219E3E0h ; This patch starts the player with the Tower Key in Julius mode. ; This is so the player doesn't get softlocked by the randomizer in Julius mode. .org 0x021F6280 ; Give all 5 magic seals (simplified version of the original code that was here) mov r4, 1Fh ldr r0, =020F7254h strb r4, [r0] ; Then give Tower Key mov r0, 2h mov r1, 39h bl 021E7870h ; GiveItem b 021F62A8h ; Jump to after the constant pool .pool .close
Change setup for protected mode
[ORG 0x10800] PMode: mov eax, 0xFEEDFACE mov ecx, 0xF00DD00D mov edx, 0xBAADBEEF .jmpy: hlt jmp .jmpy
[ORG 0x10800] [BITS 32] PMode: mov eax, 0x10 mov ds, ax mov es, ax mov fs, ax mov gs, ax mov ss, ax mov esp, 0x90000 mov ebp, esp .jmpy: hlt jmp .jmpy
Add asm patch to break balore blocks with any weapon
.nds .relativeinclude on .erroronwarning on .open "ftc/overlay9_0", 0219E3E0h ; This makes it so that all melee weapons can break balore blocks, not just Julius's whip. .org 0x02212AB0 ; Branch of a switch statement taken for all melee weapons except Julius's whip. b 02212D64h ; Instead take the branch taken for Julius's whip. .close
Add in example that was provided to create a basic "kernel" for the atari game for rendering to the screen.
processor 6502 include "vcs.h" include "macro.h" SEG ORG $F000 Reset StartOfFrame ; Start of vertical blank processing lda #0 sta VBLANK lda #2 sta VSYNC ; 3 scanlines of VSYNCH signal... sta WSYNC sta WSYNC sta WSYNC lda #0 sta VSYNC ; 37 scanlines of vertical blank... sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC ; 192 scanlines of picture... ldx #0 REPEAT 192; scanlines inx stx COLUBK sta WSYNC REPEND lda #%01000010 sta VBLANK ; end of screen - enter blanking ; 30 scanlines of overscan... sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC sta WSYNC jmp StartOfFrame ORG $FFFA .word Reset ; NMI .word Reset ; RESET .word Reset ; IRQ END
Fix load address - still not working :(
//============================================================ // .efo header //============================================================ .pc = $0 .text "EFO2" // fileformat magic .word prepare // prepare routine .word setup // setup routine .word interrupt // irq handler .word 0 // main routine .word 0 // fadeout routine .word 0 // cleanup routine .word 0 // location of playroutine call // tags //.byt "P", $04, $07 // range of pages in use //.byt "I",$10,$1f // range of pages inherited //.byt "Z",$02,$03 // range of zero-page addresses in use //.byt "S" // i/o safe //.byt "X" // avoid loading //.byt "M",<play,>play // install music playroutine .byte 0 // end-of-tags .word load_addr load_addr: .import source "init.asm" .import source "fx.asm" .import source "main.asm"
//============================================================ // .efo header //============================================================ .pc = $2000 .text "EFO2" // fileformat magic .word prepare // prepare routine .word setup // setup routine .word interrupt // irq handler .word 0 // main routine .word 0 // fadeout routine .word 0 // cleanup routine .word 0 // location of playroutine call // tags //.byt "P", $04, $07 // range of pages in use //.byt "I",$10,$1f // range of pages inherited //.byt "Z",$02,$03 // range of zero-page addresses in use //.byt "S" // i/o safe //.byt "X" // avoid loading //.byt "M",<play,>play // install music playroutine .byte 0 // end-of-tags .word load_addr load_addr: .import source "init.asm" .import source "fx.asm" .import source "main.asm"